jenkins-bot has submitted this change and it was merged.
Change subject: Swap hook subscribers for Closures/Anonymous functions etc
......................................................................
Swap hook subscribers for Closures/Anonymous functions etc
Easier to read
Change-Id: Id97355a80476cb876a3a22bd0412436772c24be6
---
M WikimediaMessages.php
1 file changed, 52 insertions(+), 67 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.php b/WikimediaMessages.php
index 16e7192..47a803b 100644
--- a/WikimediaMessages.php
+++ b/WikimediaMessages.php
@@ -22,61 +22,69 @@
$dir = dirname(__FILE__) . '/';
$wgExtensionMessagesFiles['WikimediaMessages'] = $dir
.'WikimediaMessages.i18n.php';
$wgExtensionMessagesFiles['WikimediaTemporaryMessages'] = $dir .
'WikimediaTemporaryMessages.i18n.php';
-$wgExtensionFunctions[] = 'wfSetupWikimediaMessages';
-$wgExtensionFunctions[] = 'wfWikimediaGlobalBlockMessages';
-// Bug 33464: Add a "Developers" link to the page footer
-$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
'efWikimediaDevelopersFooterLink';
-$wgHooks['MinervaPreRender'][] = 'wfWikimediaMinervaPreRender';
include_once ( $dir .'WikimediaGrammarForms.php' );
-function wfSetupWikimediaMessages() {
+$wgExtensionFunctions[] = function() {
global $wgRightsUrl, $wgHooks;
+
if( strpos( $wgRightsUrl, 'creativecommons.org/licenses/by-sa/3.0' )
!== false ) {
// Override with Wikimedia's site-specific copyright message
defaults
// with the CC/GFDL semi-dual license fun!
- $wgHooks['SkinCopyrightFooter'][] =
'efWikimediaSkinCopyrightFooter';
- $wgHooks['EditPageCopyrightWarning'][] =
'efWikimediaEditPageCopyrightWarning';
- }
-}
-function efWikimediaEditPageCopyrightWarning( $title, &$msg ) {
- $msg = array( 'wikimedia-copyrightwarning' );
- return true;
-}
+ /**
+ * @param $title Title
+ * @param $type string
+ * @param $msg string
+ * @param $link
+ * @param $forContent bool
+ * @return bool
+ */
+ $wgHooks['SkinCopyrightFooter'][] = function( $title, $type,
&$msg, &$link, &$forContent ) {
+ $siteMessageKey = 'wikimedia-copyright'; // the default
+
+ global $wgDBname;
+ if ( in_array( $wgDBname, array( 'wikidatawiki',
'testwikidatawiki' ) ) ) {
+ $siteMessageKey = 'wikidata-copyright';
+ }
+
+ if( $type != 'history' ) {
+ $msg = $siteMessageKey;
+ $forContent = false;
+ }
+
+ return true;
+ };
+
+ $wgHooks['EditPageCopyrightWarning'][] = function( $title,
&$msg ) {
+ $msg = array( 'wikimedia-copyrightwarning' );
+ return true;
+ };
+ }
+
+ //Bug 42231: Should have a specific message for WMF projects
+ $wgHooks['TorBlockBlockedMsg'][] = function( &$msg ) {
+ $msg = 'wikimedia-torblock-blocked';
+ return true;
+ };
+ $wgHooks['GlobalBlockingBlockedIpMsg'][] = function( &$msg ) {
+ $msg = 'wikimedia-globalblocking-ipblocked';
+ return true;
+ };
+ $wgHooks['GlobalBlockingBlockedIpXffMsg'][] = function( &$msg ) {
+ $msg = 'wikimedia-globalblocking-ipblocked-xff';
+ return true;
+ };
+};
/**
- * @param $title Title
- * @param $type
- * @param $msg
- * @param $link
- * @param $forContent
- * @return bool
- */
-function efWikimediaSkinCopyrightFooter( $title, $type, &$msg, &$link,
&$forContent ) {
- $siteMessageKey = 'wikimedia-copyright'; // the default
-
- global $wgDBname;
- if ( in_array( $wgDBname, array( 'wikidatawiki', 'testwikidatawiki' ) )
) {
- $siteMessageKey = 'wikidata-copyright';
- }
-
- if( $type != 'history' ) {
- $msg = $siteMessageKey;
- $forContent = false;
- }
-
- return true;
-}
-
-/**
- * Add a "Developers" link to the footer
+ * Bug 33464: Add a "Developers" link to the footer
*
- * @param $skin Skin (from includes/SkinTemplate.php)
- * @param $template Template (from includes/SkinTemplate.php)
+ * @param $skin SkinTemplate (from includes/SkinTemplate.php)
+ * @param $template QuickTemplate (from includes/SkinTemplate.php)
* @return bool
*/
-function efWikimediaDevelopersFooterLink ( &$skin, &$template ) {
+$wgHooks['SkinTemplateOutputPageBeforeExec'][] = function( &$skin, &$template
) {
// Use the value of "MediaWiki:Wikimedia-developers"
$title = Title::newFromText( $skin->msg( 'wikimedia-developers'
)->text() );
// Use the value of "MediaWiki:Wikimedia-developers-url"
@@ -87,29 +95,6 @@
return true;
};
-// Bug 42231: Should have a specific message for WMF projects
-function wfWikimediaGlobalBlockMessages() {
- global $wgHooks;
- $wgHooks['TorBlockBlockedMsg'][] = 'efWikimediaTorBlockBlockedMsg';
- $wgHooks['GlobalBlockingBlockedIpMsg'][] =
'efWikimediaGlobalBlockingBlockedIpMsg';
- $wgHooks['GlobalBlockingBlockedIpXffMsg'][] =
'efWikimediaGlobalBlockingBlockedIpXffMsg';
-}
-
-function efWikimediaTorBlockBlockedMsg( &$msg ) {
- $msg = 'wikimedia-torblock-blocked';
- return true;
-}
-
-function efWikimediaGlobalBlockingBlockedIpMsg( &$msg ) {
- $msg = 'wikimedia-globalblocking-ipblocked';
- return true;
-}
-
-function efWikimediaGlobalBlockingBlockedIpXffMsg( &$msg ) {
- $msg = 'wikimedia-globalblocking-ipblocked-xff';
- return true;
-}
-
/**
* Add a WMF-specific footer link to terms of use on mobile site
* Overrides template data right before it gets sent to template for rendering
@@ -117,11 +102,11 @@
*
* @return bool
*/
-function wfWikimediaMinervaPreRender( $tpl ) {
+$wgHooks['MinervaPreRender'][] = function( $tpl ) {
$skin = $tpl->getSkin();
// This will work only on mobile site because only SkinMobile has this
method
if ( method_exists( $skin, 'getTermsLink' ) ) {
$tpl->set( 'terms-use', $skin->getTermsLink(
'wikimedia-mobile-terms-url' ) );
}
return true;
-}
\ No newline at end of file
+};
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/107281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id97355a80476cb876a3a22bd0412436772c24be6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
