From e0a4cc035b39622a035d5de2c4ea69655d3aaae6 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Sun, 22 Jul 2007 18:14:32 +0000
Subject:

---
 system/codeigniter/CodeIgniter.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'system/codeigniter')

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)
-- 
cgit v1.2.3-24-g4f1b