From f66c71b114653f3a2a418950b258a45428871410 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:22:56 +0000 Subject: --- system/codeigniter/CodeIgniter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/codeigniter/CodeIgniter.php') diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 16fe97ac3..54f37c922 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -182,9 +182,9 @@ $EXT->_call_hook('pre_controller'); $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); // Instantiate the Controller and pass any global data that might exist -$global_data = ( ! isset($global_data)) ? NULL : $global_data; +$assign_to_controller = ( ! isset($assign_to_controller)) ? NULL : $assign_to_controller; -$CI = new $class($global_data); +$CI = new $class($assign_to_controller); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) -- cgit v1.2.3-24-g4f1b