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

Timestamp:

11/11/2007 12:59:10 AM (13 months ago)

Author:

Shadowhand

Message:

Small changes:

• Hooks are now loaded *after* system events have been added
  
• Hook loading changed to use Kohana::list_files(), rather than manually finding them (DRY!)
  
• Kohana::auto_load() now uses require_once() instead of require(), to prevent duplicate file loads that will cause E_FATAL errors
  
• Kohana::auto_load() will no longer try to auto-extend classes that end with _Core (eg: "class Special_Router extends Router_Core {}" will no longer try to auto-load "Router_Core_Core")
  
• Kohana::key_string() will handle numerically indexed key strings now (thanks Armen!)
  
• Added Event::add_before() and Event::add_after(), to add events before and after a given event, and supporting private function Event::insert_event()
  
• Cleaned up Event::add() to use empty() instead of == FALSE
  
• View::construct() uses array_merge($this->data, $data) instead of doing a foreach($data) (Duh!)
  
• View::set() will now handle an associative array (Duh!)
  
• Router::setup() split into Router::find_uri() and Router::setup(), for better Event extensibility
  
• Cleaned up Router::setup() to use self::$current_uri instead of self::$segments as the default URI location
  

Phew!

Files:

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

trunk/system/core/Kohana.php

@@ -118 +118 @@
                 setlocale(LC_ALL, Config::item('locale.language').'.UTF-8');
 
+                // Enable Kohana routing
+                Event::add('system.routing', array('Router', 'find_uri'));
+                Event::add('system.routing', array('Router', 'setup'));
+
+                // Enable Kohana controller initialization
+                Event::add('system.execute', array('Kohana', 'instance'));
+
+                // Enable Kohana output handling
+                Event::add('system.shutdown', array('Kohana', 'display'));
+
                 if ($hooks = Config::item('hooks.enable'))
                 {
-                        // All hooks are enabled, we must build an array of filenames
                         if ( ! is_array($hooks))
                         {
-                                $hooks = array();
-                                foreach(Config::include_paths() as $path)
-                                {
-                                        // Find all the hooks in each path
-                                        if ($files = glob($path.'hooks/*'.EXT))
-                                        {
-                                                $hooks = array_merge($hooks, $files);
-                                        }
-                                }
+                                // All hooks are enabled, find them
+                                $hooks = Kohana::list_files('hooks');
                         }
 
@@ -143 +145 @@
                         }
                 }
-
-                // Enable Kohana routing
-                Event::add('system.routing', array('Router', 'setup'));
-
-                // Enable Kohana controller initialization
-                Event::add('system.execute', array('Kohana', 'instance'));
-
-                // Enable Kohana output handling
-                Event::add('system.shutdown', array('Kohana', 'display'));
 
                 if (Config::item('log.threshold') > 0)
@@ -491 +484 @@
                 }
 
-                require self::find_file($type, $file, TRUE);
+                require_once self::find_file($type, $file, TRUE);
 
                 if ($type == 'libraries')
@@ -499 +492 @@
                                 require $extension;
                         }
-                        else
+                        elseif (substr($class, -5) !== '_Core')
                         {
                                 eval('class '.$class.' extends '.$class.'_Core { }');
@@ -686 +679 @@
         {
                 // No array to search
-                if (empty($keys) OR empty($array))
+                if ((empty($keys) AND is_array($keys)) OR (empty($array) AND is_array($array)))
                         return;