Merge pull request laravel#26 from nainoon/patch-1

Update Application.php
Hydrane · Apr 15, 2015 · f427766 · f427766
2 parents 4f959be + 0eb824a
commit f427766
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -935,12 +935,8 @@ protected function mergeGroupAttributes(array $action)
      */
     protected function mergeNamespaceGroup(array $action)
     {
-        if (isset($this->groupAttributes['middleware'])) {
-            if (isset($action['middleware'])) {
-                $action['middleware'] .= '|'.$this->groupAttributes['middleware'];
-            } else {
-                $action['middleware'] = $this->groupAttributes['middleware'];
-            }
+        if (isset($this->groupAttributes['namespace']) && isset($action['uses'])) {
+            $action['uses'] = $this->groupAttributes['namespace'].'\\'.$action['uses'];
         }
 
         return $action;
@@ -954,8 +950,12 @@ protected function mergeNamespaceGroup(array $action)
      */
     protected function mergeMiddlewareGroup($action)
     {
-        if (isset($this->groupAttributes['namespace']) && isset($action['uses'])) {
-            $action['uses'] = $this->groupAttributes['namespace'].'\\'.$action['uses'];
+        if (isset($this->groupAttributes['middleware'])) {
+            if (isset($action['middleware'])) {
+                $action['middleware'] .= '|'.$this->groupAttributes['middleware'];
+            } else {
+                $action['middleware'] = $this->groupAttributes['middleware'];
+            }
         }
 
         return $action;