jenkins-bot has submitted this change and it was merged. Change subject: Default to cached enwiki config for protocols ......................................................................
Default to cached enwiki config for protocols * For before the api returned the protocols siprop https://lists.wikimedia.org/pipermail/wikitext-l/2015-February/000914.html Change-Id: I38e82c0aadb5eb8584c6e615a0dc4130ae1e4752 --- M lib/mediawiki.WikiConfig.js 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki.WikiConfig.js b/lib/mediawiki.WikiConfig.js index 95c44f5..b37013b 100644 --- a/lib/mediawiki.WikiConfig.js +++ b/lib/mediawiki.WikiConfig.js @@ -378,15 +378,15 @@ // Allowed protocol prefixes this._protocols = {}; // Get information about the allowed protocols for external links. - if ( resultConf.protocols ) { - var proto, protocols = resultConf.protocols; - for ( var px = 0; px < protocols.length; px++ ) { - proto = protocols[px]; - this._protocols[proto] = true; - } - - this._protocolRegex = new RegExp( '^(' + protocols.join( '|' ) + ')', 'i' ); + // For very far backwards compatibility, default to enwiki config if + // protocols siprop is not provided. + var proto, protocols = resultConf.hasOwnProperty("protocols") ? + resultConf.protocols : baseConfig.protocols; + for ( var px = 0; px < protocols.length; px++ ) { + proto = protocols[px]; + this._protocols[proto] = true; } + this._protocolRegex = new RegExp( '^(' + protocols.join( '|' ) + ')', 'i' ); // Extension tags on this wiki, indexed by their aliases. this.extensionTags = {}; -- To view, visit https://gerrit.wikimedia.org/r/189647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38e82c0aadb5eb8584c6e615a0dc4130ae1e4752 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Subramanya Sastry <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
