load config files from environment specific locations in core classes, helpers and libraries

2 files changed, 20 insertions, 2 deletions

diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 2012fb302..24189f4b4 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -951,7 +951,16 @@ class CI_Upload {
 
 		if (count($this->mimes) == 0)
 		{
-			if (@require(APPPATH.'config/mimes'.EXT))
+			if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+			{
+			    $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
+			}
+			else
+			{
+				$_mimes_path = APPPATH.'config/mimes'.EXT;
+			}
+			
+			if (@require($_mimes_path))
 			{
 				$this->mimes = $mimes;
 				unset($mimes);
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 3774fc283..2690e174d 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -84,7 +84,16 @@ class CI_User_agent {
 	 */
 	private function _load_agent_file()
 	{
-		if ( ! @include(APPPATH.'config/user_agents'.EXT))
+		if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT))
+		{
+			$_ua_path = APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT;
+		}
+		else
+		{
+			$_ua_path = APPPATH.'config/user_agents'.EXT;
+		}
+	
+		if ( ! @include($_ua_path))
 		{
 			return FALSE;
 		}