diff options
| author | Rick Ellis <rick.ellis@ellislab.com> | 2007-07-22 20:22:56 +0200 |
|---|---|---|
| committer | Rick Ellis <rick.ellis@ellislab.com> | 2007-07-22 20:22:56 +0200 |
| commit | f66c71b114653f3a2a418950b258a45428871410 (patch) | |
| tree | 536a9aba95733bbc232c8221650a5ad470fb1dcb /system/codeigniter | |
| parent | 03717d28b76c0ff3ab30da9d93ebe1a9b8b1be37 (diff) | |
Diffstat (limited to 'system/codeigniter')
| -rw-r--r-- | system/codeigniter/CodeIgniter.php | 4 |
1 files changed, 2 insertions, 2 deletions
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)
|