Merge branch 'master' of https://github.com/photonstorm/phaser

photonstorm · photonstorm · commit 1399355d3f67 · 2018-02-15T14:31:19.000Z
diff --git a/src/loader/MergeXHRSettings.js b/src/loader/MergeXHRSettings.js
@@ -23,7 +23,7 @@ var XHRSettings = require('./XHRSettings');
  */
 var MergeXHRSettings = function (global, local)
 {
-    var output = (global === undefined) ? XHRSettings() : Extend(global);
+    var output = (global === undefined) ? XHRSettings() : Extend({}, global);
 
     if (local)
     {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ var XHRSettings = require('./XHRSettings');`
`23`	`23`	`*/`
`24`	`24`	`var MergeXHRSettings = function (global, local)`
`25`	`25`	`{`
`26`		`- var output = (global === undefined) ? XHRSettings() : Extend(global);`
	`26`	`+ var output = (global === undefined) ? XHRSettings() : Extend({}, global);`
`27`	`27`
`28`	`28`	`if (local)`
`29`	`29`	`{`