Remove second parameters from wfEmptyMsg() calls

The second parameter was removed in r64178 and is now useless.
There is probably no need to backport this in 1.17.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d906255..cd6beee 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -628,7 +628,7 @@ function wfMsgReal( $key, $args, $useDB = true, $forContent = false, $transform
  */
 function wfMsgWeirdKey( $key ) {
        $source = wfMsgGetKey( $key, false, true, false );
-       if ( wfEmptyMsg( $key, $source ) ) {
+       if ( wfEmptyMsg( $key ) ) {
                return '';
        } else {
                return $source;

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 5a0fbae..fb78970 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -920,7 +920,7 @@ abstract class HTMLFormField {
                if ( isset( $this->mParams['help-message'] ) ) {
                        $msg = $this->mParams['help-message'];
                        $helptext = wfMsgExt( $msg, 'parseinline' );
-                       if ( wfEmptyMsg( $msg, $helptext ) ) {
+                       if ( wfEmptyMsg( $msg ) ) {
                                # Never mind
                                $helptext = null;
                        }

diff --git a/includes/Skin.php b/includes/Skin.php
index a7f1482..731398e 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1424,11 +1424,11 @@ abstract class Skin extends Linker {
 
                                        $text = wfMsgExt( $line[1], 'parsemag' );
 
-                                       if ( wfEmptyMsg( $line[1], $text ) ) {
+                                       if ( wfEmptyMsg( $line[1] ) ) {
                                                $text = $line[1];
                                        }
 
-                                       if ( wfEmptyMsg( $line[0], $link ) ) {
+                                       if ( wfEmptyMsg( $line[0] ) ) {
                                                $link = $line[0];
                                        }
 

diff --git a/includes/User.php b/includes/User.php
index 892de83..4a0f2a3 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3518,7 +3518,7 @@ class User {
        static function getRightDescription( $right ) {
                $key = "right-$right";
                $name = wfMsg( $key );
-               return $name == '' || wfEmptyMsg( $key, $name )
+               return $name == '' || wfEmptyMsg( $key )
                        ? $right
                        : $name;
        }

diff --git a/includes/api/ApiQueryTags.php b/includes/api/ApiQueryTags.php
index bf012dc..61b3466 100644 (file)
--- a/includes/api/ApiQueryTags.php
+++ b/includes/api/ApiQueryTags.php
@@ -116,7 +116,7 @@ class ApiQueryTags extends ApiQueryBase {
 
                if ( $this->fld_description ) {
                        $msg = wfMsg( "tag-$tagName-description" );
-                       $msg = wfEmptyMsg( "tag-$tagName-description", $msg ) ? '' : $msg;
+                       $msg = wfEmptyMsg( "tag-$tagName-description" ) ? '' : $msg;
                        $tag['description'] = $msg;
                }
 

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 961f163..6e2f36e 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -225,7 +225,7 @@ class SpecialContributions extends SpecialPage {
                // languages that want to put the "for" bit right after $user but before
                // $links.  If 'contribsub' is around, use it for reverse compatibility,
                // otherwise use 'contribsub2'.
-               if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+               if( wfEmptyMsg( 'contribsub' ) ) {
                        return wfMsgHtml( 'contribsub2', $user, $links );
                } else {
                        return wfMsgHtml( 'contribsub', "$user ($links)" );
@@ -397,7 +397,7 @@ class SpecialContributions extends SpecialPage {
                                Xml::submitButton( wfMsg( 'sp-contributions-submit' ) )
                        ) . ' ';        
                $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
-               if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) ) {
+               if( !wfEmptyMsg( 'sp-contributions-explain' ) ) {
                        $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>";
                }
                $f .= Xml::closeElement('fieldset' ) .

diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 0e2215f..bc2a90b 100644 (file)
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -453,7 +453,7 @@ class DeletedContributionsPage extends SpecialPage {
                // languages that want to put the "for" bit right after $user but before
                // $links.  If 'contribsub' is around, use it for reverse compatibility,
                // otherwise use 'contribsub2'.
-               if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+               if( wfEmptyMsg( 'contribsub' ) ) {
                        return wfMsgHtml( 'contribsub2', $user, $links );
                } else {
                        return wfMsgHtml( 'contribsub', "$user ($links)" );

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index 761f0f0..d043863 100644 (file)
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -198,13 +198,13 @@ class SpecialStatistics extends SpecialPage {
                        }
                        $groupname = htmlspecialchars( $group );
                        $msg = wfMsg( 'group-' . $groupname );
-                       if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) {
+                       if ( wfEmptyMsg( 'group-' . $groupname ) || $msg == '' ) {
                                $groupnameLocalized = $groupname;
                        } else {
                                $groupnameLocalized = $msg;
                        }
                        $msg = wfMsgForContent( 'grouppage-' . $groupname );
-                       if ( wfEmptyMsg( 'grouppage-' . $groupname, $msg ) || $msg == '' ) {
+                       if ( wfEmptyMsg( 'grouppage-' . $groupname ) || $msg == '' ) {
                                $grouppageLocalized = MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
                        } else {
                                $grouppageLocalized = $msg;

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 18e6b9f..018a810 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -286,7 +286,7 @@ class MonoBookTemplate extends BaseTemplate {
                echo '  ' . Html::openElement( 'div', $portletAttribs );
 ?>
 
-               <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
+               <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
                <div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
                        <ul>

diff --git a/skins/Vector.php b/skins/Vector.php
index 508e785..3c30ce4 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -278,7 +278,7 @@ class VectorTemplate extends BaseTemplate {
                }
                ?>
 <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>>
-       <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg, $out ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5>
+       <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5>
        <div class="body">
 <?php
                if ( is_array( $content ) ): ?>