Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/237686
Change subject: Get rid of $wmg hack for MassMessage settings ...................................................................... Get rid of $wmg hack for MassMessage settings No longer needed after conversion to extension.json Change-Id: Ie3d64f7beb8e996f086778f961f976451b668beb --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php M wmf-config/extension-list 3 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/86/237686/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 7a21407..4dce4a8 100755 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1748,9 +1748,7 @@ } if ( $wmgUseMassMessage ) { - require_once( "$IP/extensions/MassMessage/MassMessage.php" ); - $wgNamespacesToPostIn = $wmgNamespacesToPostIn; - $wgAllowGlobalMessaging = $wmgAllowGlobalMessaging; + wfLoadExtension( 'MassMessage' ); } if ( $wmgUseSandboxLink ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5615bba..b91698b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11672,13 +11672,13 @@ 'votewiki' => false, ), -'wmgNamespacesToPostIn' => array( +'wgNamespacesToPostIn' => array( # Implicitly true for odd-numbered namespaces 'default' => array( NS_PROJECT ), '+metawiki' => array( NS_MAIN ) ), -'wmgAllowGlobalMessaging' => array( +'wgAllowGlobalMessaging' => array( 'default' => false, 'metawiki' => true, ), diff --git a/wmf-config/extension-list b/wmf-config/extension-list index 9d579cf..618901f 100644 --- a/wmf-config/extension-list +++ b/wmf-config/extension-list @@ -71,7 +71,7 @@ $IP/extensions/Listings/Listings.php $IP/extensions/LocalisationUpdate/LocalisationUpdate.php $IP/extensions/MapSources/MapSources.php -$IP/extensions/MassMessage/MassMessage.php +$IP/extensions/MassMessage/extension.json $IP/extensions/Math/Math.php $IP/extensions/MobileApp/MobileApp.php $IP/extensions/MobileFrontend/MobileFrontend.php -- To view, visit https://gerrit.wikimedia.org/r/237686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3d64f7beb8e996f086778f961f976451b668beb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits