Merge pull request #593 from LaravelCollective/decadence-patch-1

Victor Isadov · web-flow · commit ec0ebb1a6e09 · 2019-03-03T22:52:36.000+03:00
Change order in array_merge
diff --git a/src/HtmlBuilder.php b/src/HtmlBuilder.php
@@ -132,7 +132,7 @@ public function favicon($url, $attributes = [], $secure = null)
     {
         $defaults = ['rel' => 'shortcut icon', 'type' => 'image/x-icon'];
 
-        $attributes = array_merge($attributes, $defaults);
+        $attributes = array_merge($defaults, $attributes);
 
         $attributes['href'] = $this->url->asset($url, $secure);
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function favicon($url, $attributes = [], $secure = null)`
`132`	`132`	`{`
`133`	`133`	`$defaults = ['rel' => 'shortcut icon', 'type' => 'image/x-icon'];`
`134`	`134`
`135`		`- $attributes = array_merge($attributes, $defaults);`
	`135`	`+ $attributes = array_merge($defaults, $attributes);`
`136`	`136`
`137`	`137`	`$attributes['href'] = $this->url->asset($url, $secure);`
`138`	`138`