summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-10-14 11:24:36 +0200
committerAndrey Andreev <narf@devilix.net>2013-10-14 11:24:36 +0200
commit9f417d070916e82309a762639cc344445601156b (patch)
tree103e9f21df58bea0fd15dd48e5f7328bcce332a6
parentdc7aab883ac0970fcc7ee99dc28bf3b8e11b74d2 (diff)
Fix #2682
-rw-r--r--application/config/mimes.php2
-rw-r--r--application/config/user_agents.php2
-rwxr-xr-xindex.php14
-rw-r--r--system/core/Loader.php2
4 files changed, 10 insertions, 10 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 99b1c4b7d..27d4b2514 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -177,4 +177,4 @@ return array(
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */
+/* Location: ./application/config/mimes.php */ \ No newline at end of file
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 9177f3e61..899e96a94 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -223,4 +223,4 @@ $robots = array(
);
/* End of file user_agents.php */
-/* Location: ./application/config/user_agents.php */
+/* Location: ./application/config/user_agents.php */ \ No newline at end of file
diff --git a/index.php b/index.php
index 3040ef080..72c97c410 100755
--- a/index.php
+++ b/index.php
@@ -220,28 +220,28 @@ switch (ENVIRONMENT)
$application_folder = $_temp;
}
- define('APPPATH', $application_folder.'/');
+ define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
}
else
{
- if ( ! is_dir(BASEPATH.$application_folder.'/'))
+ if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
{
header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
exit(3); // EXIT_* constants not yet defined; 3 is EXIT_CONFIG.
}
- define('APPPATH', BASEPATH.$application_folder.'/');
+ define('APPPATH', BASEPATH.$application_folder.DIRECTORY_SEPARATOR);
}
// The path to the "views" folder
if ( ! is_dir($view_folder))
{
- if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.'/'))
+ if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
{
$view_folder = APPPATH.$view_folder;
}
- elseif ( ! is_dir(APPPATH.'views/'))
+ elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
{
header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
@@ -255,11 +255,11 @@ switch (ENVIRONMENT)
if (($_temp = realpath($view_folder)) !== FALSE)
{
- $view_folder = $_temp.'/';
+ $view_folder = $_temp.DIRECTORY_SEPARATOR;
}
else
{
- $view_folder = rtrim($view_folder, '/').'/';
+ $view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
}
define('VIEWPATH', $view_folder);
diff --git a/system/core/Loader.php b/system/core/Loader.php
index e0962510d..0c16632eb 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1293,4 +1293,4 @@ class CI_Loader {
}
/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */
+/* Location: ./system/core/Loader.php */ \ No newline at end of file