commit 0ea04149bbae0fdcde92b7362e7cbd76f0df3865
author bubbafoley <devnull@localhost> Thu Mar 17 14:55:41 2011 -0500
committer bubbafoley <devnull@localhost> Thu Mar 17 14:55:41 2011 -0500
tree 9e7c26f6ccec07636c424003331fbcbc41ea95ff
parent ee8a712b10b517a90f03ac858312a82e0fb5d492

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

system/core/Loader.php

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7003318..75c0943 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -975,7 +975,15 @@
 	 */
 	function _ci_autoloader()
 	{
-		include_once(APPPATH.'config/autoload'.EXT);
+		if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT))
+		{
+			include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT);
+		}
+		else
+		{
+			include_once(APPPATH.'config/autoload'.EXT);
+		}
+		
 
 		if ( ! isset($autoload))
 		{