jenkins-bot has submitted this change and it was merged.

Change subject: Simplify/reorder SkinCopyrightFooter subscriber
......................................................................


Simplify/reorder SkinCopyrightFooter subscriber

Change-Id: Id652ca26d5a8fa26201048cbb8c8f7db8454bcae
---
M WikimediaMessages.php
1 file changed, 8 insertions(+), 10 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikimediaMessages.php b/WikimediaMessages.php
index 47a803b..135a1e5 100644
--- a/WikimediaMessages.php
+++ b/WikimediaMessages.php
@@ -41,15 +41,13 @@
                 * @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;
+                       if ( $type !== 'history' ) {
+                               global $wgDBname;
+                               if ( in_array( $wgDBname, array( 
'wikidatawiki', 'testwikidatawiki' ) ) ) {
+                                       $msg = 'wikidata-copyright';
+                               } else {
+                                       $msg = 'wikimedia-copyright'; // the 
default;
+                               }
                                $forContent = false;
                        }
 
@@ -109,4 +107,4 @@
                $tpl->set( 'terms-use', $skin->getTermsLink( 
'wikimedia-mobile-terms-url' ) );
        }
        return true;
-};
\ No newline at end of file
+};

-- 
To view, visit https://gerrit.wikimedia.org/r/107284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id652ca26d5a8fa26201048cbb8c8f7db8454bcae
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to