From c26b9ebb00e29be2e972fece3bcf73d33249a64b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 24 Feb 2014 11:31:36 +0200 Subject: 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. --- system/core/URI.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'system/core/URI.php') 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); } } -- cgit v1.2.3-24-g4f1b