summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 18:28:28 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 18:28:28 +0200
commit6f1b3841b6f660dfbaa5e00df456d793e67fe60f (patch)
tree4b2c5b2d3b9b840d2f668843b92c357e42994892 /system/core/Loader.php
parent7de3160f0ed13e773fa5233af0566bcae3f99081 (diff)
If a config class was loaded first then a library with the same name is loaded, the config would be ignored.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7c8b298ac..18024242e 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -935,22 +935,22 @@ class CI_Loader {
// first, global next
if (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'))
{
- include_once($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
+ include($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
break;
}
elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
{
- include_once($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
+ include($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
break;
}
elseif (file_exists($path .'config/'.strtolower($class).'.php'))
{
- include_once($path .'config/'.strtolower($class).'.php');
+ include($path .'config/'.strtolower($class).'.php');
break;
}
elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php'))
{
- include_once($path .'config/'.ucfirst(strtolower($class)).'.php');
+ include($path .'config/'.ucfirst(strtolower($class)).'.php');
break;
}
}