diff options
author | Andrey Andreev <narf@devilix.net> | 2014-02-24 10:31:36 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2014-02-24 10:31:36 +0100 |
commit | c26b9ebb00e29be2e972fece3bcf73d33249a64b (patch) | |
tree | b10dac6db61cc657bf5c906a8495994f935c102f /system/core/URI.php | |
parent | 82179bf31f00564282f2a4d9873c6107b6732631 (diff) |
Don't use globals
- Use load_class() to get objects during bootstrap process.
- Change load_class() to accept a class constructor parameter
instead of previously unused class name prefix.
- Change CI_Router::__construct() to accept as a parameter.
Diffstat (limited to 'system/core/URI.php')
-rw-r--r-- | system/core/URI.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index 5f5a9ce42..9a545fd3a 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -628,9 +628,7 @@ class CI_URI { */ public function ruri_string() { - global $RTR; - - return ltrim($RTR->directory, '/').implode('/', $this->rsegments); + return ltrim(load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments); } } |