Changeset 2891

Timestamp:

06/24/2008 12:38:29 PM (3 months ago)

Author:

Shadowhand

Message:

Another Router follow up. This should fix all the issues with sub-directory controllers and methods being set properly.

Files:

• trunk/system/libraries/Router.php (modified) (3 diffs)

trunk/system/libraries/Router.php

@@ -86 +86 @@
                 // Prepare to find the controller
                 $controller_path = '';
+                $method_segment  = NULL;
+
+                echo Kohana::debug(self::$rsegments);
 
                 foreach (self::$rsegments as $key => $segment)
@@ -110 +113 @@
                                                 // Change controller path
                                                 self::$controller_path = $dir.$controller_path.EXT;
+
+                                                // Set the method segment
+                                                $method_segment = $key + 1;
                                         }
                                 }
@@ -124 +130 @@
                 }
 
-                if (self::$controller !== NULL AND isset(self::$rsegments[$key]))
+                if (isset(self::$rsegments[$method_segment]))
                 {
                         // Set method
-                        self::$method = self::$rsegments[$key];
-
-                        if (isset(self::$rsegments[$key + 1]))
+                        self::$method = self::$rsegments[$method_segment];
+
+                        if (isset(self::$rsegments[$method_segment + 1]))
                         {
                                 // Set arguments
-                                self::$arguments = array_slice(self::$rsegments, $key + 1);
+                                self::$arguments = array_slice(self::$rsegments, $method_segment + 1);
                         }
                 }