jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347891 )
Change subject: Added fallback for general.legaltitlechars
......................................................................
Added fallback for general.legaltitlechars
* And, consolidate fallbacks to baseConfig.
Change-Id: I91f4fa55491a9550d5069c9f741ca43b021a0657
---
M lib/config/WikiConfig.js
1 file changed, 11 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index fc1cce9..9fe20ea 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -69,6 +69,17 @@
' may not support necessary features. Proceed with
caution!');
}
+ // Was introduced in T49651 (core f9c50bd7)
+ if (general.legaltitlechars === undefined &&
mwApiVersion.compare('1.25.0') < 0) {
+ this.siteInfo.general.legaltitlechars =
baseConfig.general.legaltitlechars;
+ }
+
+ // Was introduced in T46449 (core 1b64ddf0)
+ var protocols = resultConf.protocols;
+ if (protocols === undefined && mwApiVersion.compare('1.21.0') < 0) {
+ protocols = baseConfig.protocols;
+ }
+
// Preferred words are first in MessagesXx.php as of 1.27.0-wmf.20
(T116020)
this.useOldAliasOrder = mwApiVersion.compare('1.27.0-wmf.20') < 0 &&
mwApiVersion.compare('1.27.0-alpha') !== 0;
@@ -488,10 +499,6 @@
// Allowed protocol prefixes
this._protocols = {};
// Get information about the allowed protocols for external links.
- // For very far backwards compatibility, default to enwiki config if
- // protocols siprop is not provided.
- var protocols = resultConf.hasOwnProperty("protocols") ?
- resultConf.protocols : baseConfig.protocols;
for (var px = 0; px < protocols.length; px++) {
var proto = protocols[px];
this._protocols[proto] = true;
--
To view, visit https://gerrit.wikimedia.org/r/347891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91f4fa55491a9550d5069c9f741ca43b021a0657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[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
