Wizardist has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61917
Change subject: (Bug 47732) Chrome blocks API calls to foreign Wikipedia APIs
due to insecure protocol
......................................................................
(Bug 47732) Chrome blocks API calls to foreign Wikipedia APIs due to insecure
protocol
Changing the protocol to the one request was made by.
Change-Id: I8d13025726300f367e054f3ace52c945003d80c4
---
M lib/includes/modules/SitesModule.php
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/17/61917/1
diff --git a/lib/includes/modules/SitesModule.php
b/lib/includes/modules/SitesModule.php
index 4f2f713..7658443 100644
--- a/lib/includes/modules/SitesModule.php
+++ b/lib/includes/modules/SitesModule.php
@@ -54,12 +54,18 @@
if ( $site->getType() === Site::TYPE_MEDIAWIKI &&
$site->getGroup() === 'wikipedia' ) {
$languageName = Utils::fetchLanguageName(
$site->getLanguageCode() );
+ // set the same protocol as one requested by
+ list( $pageUrl, $apiUrl ) = preg_replace(
+ "^https?",
+
$context->getRequest()->detectProtocol(),
+ array( $site->getPageUrl(),
$site->getFileUrl( 'api' ) ) );
+
$sites[$site->getLanguageCode()] = array(
'shortName' => $languageName,
'name' => $languageName,
'globalSiteId' => $site->getGlobalId(),
- 'pageUrl' => $site->getPageUrl(),
- 'apiUrl' => $site->getFileUrl(
'api.php' ),
+ 'pageUrl' => $pageUrl,
+ 'apiUrl' => $apiUrl,
'languageCode' =>
$site->getLanguageCode()
);
}
--
To view, visit https://gerrit.wikimedia.org/r/61917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d13025726300f367e054f3ace52c945003d80c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Wizardist <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
