diff options
| author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
|---|---|---|
| committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
| commit | 44a6d1da2be916fe0f23a3ea4d5fcb391d7f65dd (patch) | |
| tree | 31549ebf6ea5ea98e4347eb640d1caa685316f3e /system/core/Router.php | |
| parent | 353f9834adf3f44c6c7a0f924089bb2b43360404 (diff) | |
| parent | eb291c1d1e1116a4420fa30e587adeea0451eeb7 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/core/Router.php')
| -rw-r--r-- | system/core/Router.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index f284e29cc..bb0ce16bd 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -133,13 +133,14 @@ class CI_Router { } // Load the routes.php file. - if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php')) + if (file_exists(APPPATH.'config/routes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/routes.php'); + include(APPPATH.'config/routes.php'); } - elseif (is_file(APPPATH.'config/routes.php')) + + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/routes.php')) { - include(APPPATH.'config/routes.php'); + include(APPPATH.'config/'.ENVIRONMENT.'/routes.php'); } $this->routes = (empty($route) OR ! is_array($route)) ? array() : $route; |