diff options
| author | Rick Ellis <rick.ellis@ellislab.com> | 2007-07-22 20:14:32 +0200 |
|---|---|---|
| committer | Rick Ellis <rick.ellis@ellislab.com> | 2007-07-22 20:14:32 +0200 |
| commit | e0a4cc035b39622a035d5de2c4ea69655d3aaae6 (patch) | |
| tree | f97d4217f3489757045ca5a56a2b8a63f0cb4868 /system/codeigniter | |
| parent | 183fe844a99da30c4bc2b4b8d881f6b94310dbc5 (diff) | |
Diffstat (limited to 'system/codeigniter')
| -rw-r--r-- | system/codeigniter/CodeIgniter.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index b5f21a1b7..16fe97ac3 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -181,8 +181,10 @@ $EXT->_call_hook('pre_controller'); // Mark a start point so we can benchmark the controller
$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start');
-// Instantiate the Controller
-$CI = new $class();
+// Instantiate the Controller and pass any global data that might exist
+$global_data = ( ! isset($global_data)) ? NULL : $global_data;
+
+$CI = new $class($global_data);
// Is this a scaffolding request?
if ($RTR->scaffolding_request === TRUE)
|