Revert "Abstracting the loading of files in the config directory depending on environments."
This reverts commit 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a.
diff --git a/system/core/Router.php b/system/core/Router.php
index 5388a92..748678d 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -141,7 +141,14 @@
}
// Load the routes.php file.
- load_environ_config('routes');
+ if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php'))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/routes.php');
+ }
+ elseif (is_file(APPPATH.'config/routes.php'))
+ {
+ include(APPPATH.'config/routes.php');
+ }
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);