summaryrefslogtreecommitdiffstats
path: root/system/core/Router.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
committerGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
commit5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (patch)
tree3dc36050275f67bbb7ba52f92d62609b12291369 /system/core/Router.php
parent11ce5da8c743b5f6592c83a2b91e545d76a8789b (diff)
Abstracting the loading of files in the config directory depending on environments.
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-xsystem/core/Router.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 748678d67..5388a9289 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -141,14 +141,7 @@ class CI_Router {
}
// Load the routes.php file.
- 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');
- }
+ load_environ_config('routes');
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);