jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352979 )
Change subject: DynamicSidebar: Use standard extension registration
......................................................................
DynamicSidebar: Use standard extension registration
Change-Id: Iad783c1da01a6ef2605e748a180fca68c468589e
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/wikitech.php
3 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Chad: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 18465ea..7ccf087 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3554,6 +3554,10 @@
];
}
+if ( $wmgUseDynamicSidebar ) {
+ wfLoadExtension( 'DynamicSidebar' );
+}
+
if ( $wmfRealm === 'labs' ) {
require( "$wmfConfigDir/CommonSettings-labs.php" );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 18d92b3..584929f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18588,6 +18588,12 @@
'enwiki' => true,
],
+'wmgUseDynamicSidebar' => [
+ 'default' => false,
+ 'labswiki' => true,
+ 'labstestwiki' => true,
+],
+
];
### WMF Labs override #####
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 7b67770..299ce90 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -166,5 +166,3 @@
if ( file_exists( '/etc/mediawiki/WikitechPrivateSettings.php' ) ) {
require_once( '/etc/mediawiki/WikitechPrivateSettings.php' );
}
-
-require_once( "$IP/extensions/DynamicSidebar/DynamicSidebar.php" );
--
To view, visit https://gerrit.wikimedia.org/r/352979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad783c1da01a6ef2605e748a180fca68c468589e
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
