Changeset 3394

Timestamp:

08/29/2008 12:11:38 PM (3 months ago)

Author:

Shadowhand

Message:

Follow up to r3366, fixed a bug that would prevent Router::compile() from adding slashes to non-key segments.

Files:

• trunk/system/classes/router.php (modified) (3 diffs)

trunk/system/classes/router.php

@@ -70 +70 @@
                         $regex = Router::compile($route);
 
+                        echo Kohana::debug($name, $regex);
+
                         if (preg_match('#^'.$regex.'$#u', self::$current_uri, $matches))
                         {
@@ -106 +108 @@
                                 }
 
+                                echo Kohana::debug($route, $regex);exit;
+
                                 // Set controller name
                                 self::$controller = $route['controller'];
@@ -333 +337 @@
                                 {
                                         // Add slash from previous segment
-                                        $uri[$i] .= '/';
+                                        $uri[$i - 1] .= '/';
                                 }
                         }