Pass CI_Config as a parameter to CI_URI constructor

bcit-ci · Feb 15, 2016 · 2a34081 · 2a34081
1 parent 2426635
commit 2a34081
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
@@ -298,7 +298,7 @@
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI =& load_class('URI', 'core', $CFG);
 
 /*
  * ------------------------------------------------------

diff --git a/system/core/URI.php b/system/core/URI.php
@@ -96,9 +96,9 @@ class CI_URI {
 	 *
 	 * @return	void
 	 */
-	public function __construct()
+	public function __construct(CI_Config &$config)
 	{
-		$this->config =& load_class('Config', 'core');
+		$this->config = $config;
 
 		// If it's a CLI request, ignore the configuration
 		if (is_cli())