Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281829
Change subject: Echo: Fix $wgCrossSiteAJAXdomains
......................................................................
Echo: Fix $wgCrossSiteAJAXdomains
There are no other references to $wgCrossSiteAJAXdomains currently
(except the default empty array in core), but + is not correct
for numeric arrays. Since it operates on key, it will just ignore
the right array for any conflicting indices.
Change-Id: I021a9ec77209f5d9d6f3f0e05c9c9b23e522a9ce
---
M puppet/modules/role/templates/echo/CORS.php.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/29/281829/1
diff --git a/puppet/modules/role/templates/echo/CORS.php.erb
b/puppet/modules/role/templates/echo/CORS.php.erb
index c07dc97..1ca65f3 100644
--- a/puppet/modules/role/templates/echo/CORS.php.erb
+++ b/puppet/modules/role/templates/echo/CORS.php.erb
@@ -1,4 +1,4 @@
-$wgCrossSiteAJAXdomains = array(
+$wgCrossSiteAJAXdomains = array_merge( array(
// HTTP
'127.0.0.1:<%= @forwarded_port %>',
'localhost:<%= @forwarded_port %>',
@@ -11,4 +11,4 @@
'127.0.0.1:6081',
'localhost:6081',
'*<%= scope['::mediawiki::multiwiki::base_domain'] %>:6081'
-) + $wgCrossSiteAJAXdomains;
+), $wgCrossSiteAJAXdomains );
--
To view, visit https://gerrit.wikimedia.org/r/281829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I021a9ec77209f5d9d6f3f0e05c9c9b23e522a9ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
