Anonymous avatar Anonymous committed a9b901c

Changed loading process for database config to check for config for the set environment first.

Comments (0)

Files changed (1)


 	// Load the DB config file if a DSN string wasn't passed
 	if (is_string($params) AND strpos($params, '://') === FALSE)
-		include(APPPATH.'config/database'.EXT);
+		$file_path = APPPATH.'config/'.ENVIRONMENT.'/database'.EXT;
+		if ( ! file_exists($file_path))
+		{
+			log_message('debug', 'Database config for '.ENVIRONMENT.' environment is not found. Trying global config.');
+			$file_path = APPPATH.'config/database'.EXT;
+			if ( ! file_exists($file_path))
+			{
+				continue;
+			}
+		}
+		include($file_path);
 		if ( ! isset($db) OR count($db) == 0)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.