Merge pull request #716 from LuckyCyborg/master

Support the Deep Grouping into Routing
nova-framework · Apr 10, 2016 · d3b87b6 · d3b87b6
2 parents cd6e2db + 654ee21
commit d3b87b6
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/system/Core/Router.php b/system/Core/Router.php
@@ -222,23 +222,27 @@ public function addRoute($method, $route, $callback = null)
         $pattern = ltrim($route, '/');
 
         if (! empty(self::$routeGroups)) {
-            $prefixes  = array();
+            $parts     = array();
             $namespace = '';
 
             foreach (self::$routeGroups as $group) {
                 // Add the current prefix to the prefixes list.
-                array_push($prefixes, $group['prefix']);
+                array_push($parts, $group['prefix']);
                 // Keep always the last Controller's namespace.
                 $namespace = $group['namespace'];
             }
 
+            if (! empty($pattern)) {
+                array_push($parts, $pattern);
+            }
+
             // Adjust the Route PATTERN.
-            if(! empty($prefixes)) {
-                $pattern = implode('/', $prefixes) .'/' .$pattern;
+            if (! empty($parts)) {
+                $pattern = implode('/', $parts);
             }
 
             // Adjust the Route CALLBACK, when it is not a Closure.
-            if(! empty($namespace) && ! is_object($callback)) {
+            if (! empty($namespace) && ! is_object($callback)) {
                 $callback = $namespace .'\\' .$callback;
             }
         }