diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-15 16:51:58 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-15 16:51:58 +0100 |
| commit | 60f71be48a6b91cc314908c3c0007f13e9cb2f0a (patch) | |
| tree | c7eb0d43c976984303886503781e0fcae0f0949a /system/core/CodeIgniter.php | |
| parent | 9916bfc126b0d6efa337740b263f123c5367fc55 (diff) | |
| parent | d8b1ad31cf7ee205ddf3cf396b1d1bfa45af49fa (diff) | |
Merge changes from develop
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rw-r--r-- | system/core/CodeIgniter.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 45c3485bf..cc12f149f 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -163,12 +163,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ $RTR =& load_class('Router', 'core'); - // Set any routing overrides that may exist in the main index file - if (isset($routing)) - { - $RTR->_set_overrides($routing); - } - /* * ------------------------------------------------------ * Instantiate the output class |