jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgApiFrameOptions override for UploadWizard wikis, no
longer needed
......................................................................
Remove $wgApiFrameOptions override for UploadWizard wikis, no longer needed
After T126763, UploadWizard no longer relies on loading api.php in an iframe.
Bug: T131182
Change-Id: I59e9eb59a9e6f817ffd5788659b6050dacffd789
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Dereckson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa84882..cc6a7c1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1982,14 +1982,10 @@
$wgUploadWizardConfig["missingCategoriesWikiText"] =
"{{subst:unc}}";
$wgUploadWizardConfig['blacklistIssuesPage'] =
'Wikipedia:Upload_Wizard_blacklist_issues'; # Set by neilk, 2011-11-01, per erik
}
-
- // Needed to make UploadWizard work in IE, see T41877
- $wgApiFrameOptions = 'SAMEORIGIN';
-} else {
- // If XFO wasn't specified due to UploadWizard, set it here
- $wgApiFrameOptions = $wmgApiFrameOptions;
}
+$wgApiFrameOptions = $wmgApiFrameOptions;
+
if ( $wmgUseBetaFeatures ) {
wfLoadExtension( 'BetaFeatures' );
}
--
To view, visit https://gerrit.wikimedia.org/r/282768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59e9eb59a9e6f817ffd5788659b6050dacffd789
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Dereckson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
