Merge pull request laravel#242 from callam/patch-1

taylorotwell · taylorotwell · commit 89d15982857c · 2015-09-07T08:26:17.000-05:00
[5.1] Append middleware of action to group middleware
diff --git a/src/Application.php b/src/Application.php
@@ -1071,7 +1071,7 @@ protected function mergeMiddlewareGroup($action)
     {
         if (isset($this->groupAttributes['middleware'])) {
             if (isset($action['middleware'])) {
-                $action['middleware'] .= '|'.$this->groupAttributes['middleware'];
+                $action['middleware'] = $this->groupAttributes['middleware'].'|'.$action['middleware'];
             } else {
                 $action['middleware'] = $this->groupAttributes['middleware'];
             }

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@ protected function mergeMiddlewareGroup($action)`
`1071`	`1071`	`{`
`1072`	`1072`	`if (isset($this->groupAttributes['middleware'])) {`
`1073`	`1073`	`if (isset($action['middleware'])) {`
`1074`		`- $action['middleware'] .= '\|'.$this->groupAttributes['middleware'];`
	`1074`	`+ $action['middleware'] = $this->groupAttributes['middleware'].'\|'.$action['middleware'];`
`1075`	`1075`	`} else {`
`1076`	`1076`	`$action['middleware'] = $this->groupAttributes['middleware'];`
`1077`	`1077`	`}`