From 53c750bf4a8d358723fc16915b254990f180908d Mon Sep 17 00:00:00 2001 From: hiyao Date: Thu, 6 Oct 2016 06:08:21 +0800 Subject: [PATCH] Fix CI_URI::__construct() See #116 --- application/tests/_ci_phpunit_test/functions.php | 2 +- .../tests/_ci_phpunit_test/replacing/core/CodeIgniter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/tests/_ci_phpunit_test/functions.php b/application/tests/_ci_phpunit_test/functions.php index d258b846..42094108 100644 --- a/application/tests/_ci_phpunit_test/functions.php +++ b/application/tests/_ci_phpunit_test/functions.php @@ -58,7 +58,7 @@ function reset_instance() CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT); $CFG =& load_class('Config', 'core'); CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG); - $UNI =& load_class('URI', 'core'); + $UNI =& load_class('URI', 'core', $CFG); CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI); // $URI =& load_class('Utf8', 'core'); // CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); diff --git a/application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php b/application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php index cdf043e1..3250b567 100644 --- a/application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php +++ b/application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php @@ -302,7 +302,7 @@ * Instantiate the URI class * ------------------------------------------------------ */ - $URI =& load_class('URI', 'core'); + $URI =& load_class('URI', 'core', $CFG); CIPHPUnitTestSuperGlobal::set_Global('URI', $URI); /*