Set error_reporting to E_ALL when environment unknown and changed CI_Loader to load environment configs first.

2 files changed, 14 insertions, 2 deletions

diff --git a/index.php b/index.php
index 016ffc015..7741d5cb8 100644
--- a/index.php
+++ b/index.php
@@ -112,6 +112,7 @@
 	}
 	else
 	{
+		error_reporting(E_ALL);
 		exit("The application environment is not set correctly.");		
 	}
 	
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 225b43912..640a6302b 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -880,8 +880,19 @@ class CI_Loader {
 				foreach ($config_component->_config_paths as $path)
 				{
 					// We test for both uppercase and lowercase, for servers that
-					// are case-sensitive with regard to file names
-					if (file_exists($path .'config/'.strtolower($class).EXT))
+					// are case-sensitive with regard to file names. Check for environment
+					// first, global next
+					if (file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).EXT))
+					{
+						include_once($path .'config/'.ENVIRONMENT.'/'.strtolower($class).EXT);
+						break;
+					}
+					elseif (file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).EXT))
+					{
+						include_once($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).EXT);
+						break;
+					}
+					elseif (file_exists($path .'config/'.strtolower($class).EXT))
 					{
 						include_once($path .'config/'.strtolower($class).EXT);
 						break;