Changeset 652 for trunk/system/core/Kohana.php

Timestamp:

10/04/2007 08:10:40 PM (14 months ago)

Author:

Shadowhand

Message:

A few small changes:

• Cleaned up debug logging
  
• Changed Kohana::display() to be run in the "system.shutdown" Event
  
• Changed Bootstrap to call "system.shutdown" as the last operation
  

Files:

• trunk/system/core/Kohana.php (modified) (3 diffs)

trunk/system/core/Kohana.php

@@ -132 +132 @@
                 set_exception_handler(array('Kohana', 'exception_handler'));
 
-                // Set shutdown handler to run the 'system.shutdown' event
-                register_shutdown_function(array('Event', 'run'), 'system.shutdown');
-
                 if (function_exists('date_default_timezone_set'))
                 {
@@ -170 +167 @@
                 }
 
+                // Enable routing
+                Event::add('system.routing', array('Router', 'setup'));
+
+                // Enabel loading a Kohana instance
+                Event::add('system.execute', array('Kohana', 'instance'));
+
                 // Enable log writing if the log threshold is enabled
                 if(Config::item('log.threshold') > 0)
@@ -176 +179 @@
                 }
 
-                // Enable routing
-                Event::add('system.routing', array('Router', 'setup'));
-
-                // Enabel loading a Kohana instance
-                Event::add('system.execute', array('Kohana', 'instance'));
+                Event::add('system.shutdown', array('Kohana', 'display'));
 
                 // Setup is complete