jenkins-bot has submitted this change and it was merged.
Change subject: Enable XFO: SAMEORIGIN for enwiki
......................................................................
Enable XFO: SAMEORIGIN for enwiki
Bug: 39877
Change-Id: I8b6482e4e4d1f7535d68e72deefc4b4004555145
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, but someone else must approve
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 67c80ce..7724777 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1878,6 +1878,9 @@
// Needed to make UploadWizard work in IE, see bug 39877
$wgApiFrameOptions = 'SAMEORIGIN';
+} else {
+ // If XFO wasn't specified due to UploadWizard, set it here
+ $wgApiFrameOptions = $wmgApiFrameOptions;
}
if ( $wmgUseVisualEditor ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 21ddc2f..ceabcb7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10506,6 +10506,12 @@
'foundationwiki' => true,
),
+
+'wmgApiFrameOptions' => array(
+ 'default' => 'DENY',
+ 'enwiki' => 'SAMEORIGIN', // Bug 39877
+),
+
'wmgAltUploadForm' => array( // bug 33513
'default' => 'Special:Upload',
'test2wiki' => 'Wikipedia:Upload',
--
To view, visit https://gerrit.wikimedia.org/r/82751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b6482e4e4d1f7535d68e72deefc4b4004555145
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
