Changeset 3371

Timestamp:

08/27/2008 06:04:33 PM (3 months ago)

Author:

Shadowhand

Message:

Follow up to r3366, :controller and :method params will now replace slashes with underscores, which allows multiple segments to be used as the controller or method name, eg (for an admin route):

':controller/:method/:id'
'regex' => array('controller' => 'admin/[a-z]+')

Files:

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

trunk/system/classes/router.php

@@ -25 +25 @@
          *
          * [ref-esr]: http://docs.kohanaphp.com/events/system.routing
+         *
          * @return  boolean
          */
@@ -81 +82 @@
                                                 }
 
-                                                if (isset($route[$key]))
+                                                if ($key !== 'controller' AND $key !== 'method' AND isset($route[$key]))
                                                 {
                                                         // Add the value to the arguments
@@ -90 +91 @@
 
                                 // Set controller name
-                                self::$controller = $route['controller'];
+                                self::$controller = str_replace('/', '_', $route['controller']);
 
                                 if (isset($route['method']))
                                 {
                                         // Set controller method
-                                        self::$method = $route['method'];
+                                        self::$method = str_replace('/', '_', $route['method']);
                                 }
                                 else