Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/136158
Change subject: Allow bundler to understand protocol relative urls ...................................................................... Allow bundler to understand protocol relative urls Change-Id: I131cce70e7395c1d02027a98655bb2509b7b7737 --- M lib/api.js 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler refs/changes/58/136158/1 diff --git a/lib/api.js b/lib/api.js index 4ebe808..672b730 100644 --- a/lib/api.js +++ b/lib/api.js @@ -15,9 +15,15 @@ if (!nojson) { queryobj.format = 'json'; } - var apiURL = - url.resolve(this.wikis[wiki].baseurl + '/', 'api.php') + - '?' + querystring.stringify(queryobj); + + var apiURL = this.wikis[wiki].baseurl; + if (apiURL.indexOf('//') === 0) { + // Protocol relative URL which url.resolve doesn't understand + // Assuming http + apiURL = 'http:' + apiURL; + } + apiURL = url.resolve(apiURL + '/', 'api.php') + '?' + querystring.stringify(queryobj); + return nodefn.call(request, { url: apiURL, encoding: 'utf8' }). then(function(result) { var response = result[0], body = result[1]; -- To view, visit https://gerrit.wikimedia.org/r/136158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I131cce70e7395c1d02027a98655bb2509b7b7737 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler Gerrit-Branch: master Gerrit-Owner: Mwalker <mwal...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits