summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-07 20:28:32 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-07 20:28:32 +0100
commitd52b242545376db2eb8146f16125819a391db763 (patch)
treebd2c764b81b7013a3e9173f0aeb931ac42d853b5 /system/core
parentccabcfd68919ecf146cd5f21079365afbffad000 (diff)
Reverted DIRECTORY_SEPARATOR changes
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Config.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index 55da4e338..66369115a 100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -73,7 +73,7 @@ class CI_Config {
public function __construct()
{
$this->config =& get_config();
- log_message('debug', "Config Class Initialized");
+ log_message('debug', 'Config Class Initialized');
// Set the base_url automatically if none was provided
if ($this->config['base_url'] == '')
@@ -111,12 +111,12 @@ class CI_Config {
foreach ($this->_config_paths as $path)
{
$check_locations = defined('ENVIRONMENT')
- ? array(ENVIRONMENT.DIRECTORY_SEPARATOR.$file, $file)
+ ? array(ENVIRONMENT.'/'.$file, $file)
: array($file);
foreach ($check_locations as $location)
{
- $file_path = $path.'config'.DIRECTORY_SEPARATOR.$location.'.php';
+ $file_path = $path.'config/'.$location.'.php';
if (in_array($file_path, $this->is_loaded, TRUE))
{