Changeset 3396

Timestamp:

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

Author:

Shadowhand

Message:

A real fix for r3393

Files:

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

trunk/system/classes/router.php

@@ -73 +73 @@
                         {
                                 // If matches exist and there are keys for the URI, parse them
-                                if ($keys = Router::keys($route[0]))
+                                if (count($matches) > 1 AND $keys = Router::keys($route[0]))
                                 {
                                         // Remove the matched string
@@ -91 +91 @@
                                                         $route[$key] = $matches[$i];
                                                 }
-
-                                                if (isset($route['prefix'][$key]))
+                                        }
+                                }
+
+                                if (isset($route['prefix']))
+                                {
+                                        foreach ($route['prefix'] as $key => $prefix)
+                                        {
+                                                if (isset($route[$key]))
                                                 {
                                                         // Add the prefix to the key
                                                         $route[$key] = $route['prefix'][$key].$route[$key];
                                                 }
-
-                                                if ($key !== 'controller' AND $key !== 'method' AND isset($route[$key]))
-                                                {
-                                                        // Add the value to the arguments
-                                                        self::$arguments[$key] = $route[$key];
-                                                }
                                         }
+                                }
+
+                                foreach ($route as $key => $val)
+                                {
+                                        if ( ! is_string($key) OR $key === 'controller' OR $key === 'method' OR in_array($key, self::$readonly_keys))
+                                        {
+                                                // These keys are not arguments, skip them
+                                                continue;
+                                        }
+
+                                        self::$arguments[$key] = $val;
                                 }
 
@@ -122 +133 @@
                                 // A matching route has been found!
                                 self::$current_route = $name;
+
+                                echo Kohana::debug($route, self::$arguments);exit;
 
                                 return TRUE;