Changeset 678

Timestamp:

10/06/2007 08:19:56 PM (14 months ago)

Author:

Shadowhand

Message:

Small changes:

• Fixed a bug in html::
  
• Updated Kohana::instance() to not catch exceptions, more verbosity is good
  
• Fixed a bug in View that prevented set() from working properly
  
• Fixed a bug in Router that would cause the arguments to be empty when using the segment[0] shortcut
  

Location:

trunk/system

Files:

• core/Kohana.php (modified) (3 diffs)
• helpers/html.php (modified) (5 diffs)
• libraries/Router.php (modified) (1 diff)
• libraries/View.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -198 +198 @@
                 if (self::$instance == FALSE)
                 {
+                        // Include the Controller file
+                        require Router::$directory.Router::$controller.EXT;
+
                         // Run system.pre_controller
                         Event::run('system.pre_controller');
 
-                        // Include the Controller file
-                        require Router::$directory.Router::$controller.EXT;
-
                         // Set controller class name
                         $controller = ucfirst(Router::$controller).'_Controller';
 
-                        try
-                        {
-                                // Load the controller
-                                $controller = new $controller();
-                        }
-                        catch (Kohana_Exception $exception)
-                        {
-                                Kohana::show_404();
-                                return;
-                        }
+                        // Load the controller
+                        $controller = new $controller();
 
                         if (method_exists($controller, '_remap'))
@@ -244 +236 @@
                         else
                         {
-                                $controller->show_404();
-                        }
-                        if (count(Router::$arguments) > 0)
+                                Kohana::show_404();
+                        }
+
+                        if (is_array(Router::$arguments) AND ! empty(Router::$arguments))
                         {
                                 call_user_func_array(array(Kohana::instance(), Router::$method), Router::$arguments);
@@ -254 +247 @@
                                 call_user_func(array(Kohana::instance(), Router::$method));
                         }
+
 
                         // Run system.pre_controller

trunk/system/helpers/html.php

@@ -144 +144 @@
         }
 
-        public static function stylesheet($style, $index = FALSE, $media = FALSE)
+        public static function stylesheet($style, $media = FALSE)
         {
                 $compiled = '';
@@ -152 +152 @@
                         foreach($style as $name)
                         {
-                                $compiled .= self::stylesheet($name, $index, $media)."\n";
+                                $compiled .= self::stylesheet($name, $media)."\n";
                         }
                 }
@@ -159 +159 @@
                         $media = ($media == FALSE) ? '' : ' media="'.$media.'"';
 
-                        $compiled = '<link rel="stylesheet" href="'.url::base($index).$style.'.css"'.$media.' />';
+                        $compiled = '<link rel="stylesheet" href="'.url::base(TRUE).$style.'.css"'.$media.' />';
                 }
 
@@ -173 +173 @@
          * @return string
          */
-        public static function script($script, $index = FALSE)
+        public static function script($script)
         {
                 $compiled = '';
@@ -186 +186 @@
                 else
                 {
-                        $compiled = '<script type="text/javascript" src="'.url::base($index).$script.'.js"></script>';
+                        $compiled = '<script type="text/javascript" src="'.url::base(TRUE).$script.'.js"></script>';
                 }
 

trunk/system/libraries/Router.php

@@ -197 +197 @@
                         self::$controller = self::$rsegments[0];
                         self::$method     = isset(self::$rsegments[1]) ? self::$rsegments[1] : 'index';
+                        self::$arguments  = isset(self::$rsegments[2]) ? array_slice(self::$rsegments, 2) : array();
                 }
                 else

trunk/system/libraries/View.php

@@ -90 +90 @@
         }
 
-        public function & __get($name)
+        public function __get($name)
         {
-                if (isset($this->data))
-                        return $this->data;
-
-                return FALSE;
+                return empty($this->data[$name]) ? NULL : $this->data[$name];
         }