MaxSem has submitted this change and it was merged.
Change subject: Disable ™ on meta wiki
......................................................................
Disable ™ on meta wiki
Bug: 41141
Change-Id: I96417233cb475a4f4d425f2ea709e2365ad7cc6f
---
M wmf-config/InitialiseSettings.php
M wmf-config/mobile.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
awjrichards: Verified; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 8921270..d9e2708 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11168,6 +11168,12 @@
'testwiki' => true,
),
+# trademark status
+'wmgMFTrademarkSitename' => array(
+ 'default' => true,
+ 'metawiki' => false, // bug 41141
+),
+
'wgExtraGenderNamespaces' => array(
'default' => array(),
'cswiki' => array(
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 39ae0e1..d0dff47 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -160,8 +160,7 @@
}
// Enable appending of TM (text) / (R) (icon) on site name in footer.
-// See bug 41141 though, we may wish to disable on some sites.
-$wgMFTrademarkSitename = true;
+$wgMFTrademarkSitename = $wmgMFTrademarkSitename;
$wgMFLogEvents = $wmgMFLogEvents;
--
To view, visit https://gerrit.wikimedia.org/r/60885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96417233cb475a4f4d425f2ea709e2365ad7cc6f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
