summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:26:52 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:26:52 +0200
commit8ebd1b7a21dec212be7ba0be51ce671f45b389ca (patch)
tree901994b8a4703468c5afcc782562f51d97f89a58 /system/core
parentba4636187a745a287c81517fbc53f2f30fe16d88 (diff)
parent3684d349d1f5239ad9703c07f14ae77389818daf (diff)
Merge pull request #1262 from Korri/develop
Fix Issue #627
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 5f283dc3a..5f2137d51 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -673,7 +673,7 @@ class CI_Loader {
// Add config file path
$config =& $this->_ci_get_component('config');
- array_unshift($config->_config_paths, $path);
+ array_push($config->_config_paths, $path);
}
// --------------------------------------------------------------------
@@ -713,7 +713,7 @@ class CI_Loader {
array_shift($this->_ci_model_paths);
array_shift($this->_ci_helper_paths);
array_shift($this->_ci_view_paths);
- array_shift($config->_config_paths);
+ array_pop($config->_config_paths);
}
else
{