| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -278,7 +278,7 @@ |
| 279 | 279 | } |
| 280 | 280 | ?> |
| 281 | 281 | <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>> |
| 282 | | - <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg, $out ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5> |
| | 282 | + <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5> |
| 283 | 283 | <div class="body"> |
| 284 | 284 | <?php |
| 285 | 285 | if ( is_array( $content ) ): ?> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -286,7 +286,7 @@ |
| 287 | 287 | echo ' ' . Html::openElement( 'div', $portletAttribs ); |
| 288 | 288 | ?> |
| 289 | 289 | |
| 290 | | - <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5> |
| | 290 | + <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5> |
| 291 | 291 | <div class='pBody'> |
| 292 | 292 | <?php if ( is_array( $cont ) ) { ?> |
| 293 | 293 | <ul> |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3518,7 +3518,7 @@ |
| 3519 | 3519 | static function getRightDescription( $right ) { |
| 3520 | 3520 | $key = "right-$right"; |
| 3521 | 3521 | $name = wfMsg( $key ); |
| 3522 | | - return $name == '' || wfEmptyMsg( $key, $name ) |
| | 3522 | + return $name == '' || wfEmptyMsg( $key ) |
| 3523 | 3523 | ? $right |
| 3524 | 3524 | : $name; |
| 3525 | 3525 | } |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -628,7 +628,7 @@ |
| 629 | 629 | */ |
| 630 | 630 | function wfMsgWeirdKey( $key ) { |
| 631 | 631 | $source = wfMsgGetKey( $key, false, true, false ); |
| 632 | | - if ( wfEmptyMsg( $key, $source ) ) { |
| | 632 | + if ( wfEmptyMsg( $key ) ) { |
| 633 | 633 | return ''; |
| 634 | 634 | } else { |
| 635 | 635 | return $source; |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -920,7 +920,7 @@ |
| 921 | 921 | if ( isset( $this->mParams['help-message'] ) ) { |
| 922 | 922 | $msg = $this->mParams['help-message']; |
| 923 | 923 | $helptext = wfMsgExt( $msg, 'parseinline' ); |
| 924 | | - if ( wfEmptyMsg( $msg, $helptext ) ) { |
| | 924 | + if ( wfEmptyMsg( $msg ) ) { |
| 925 | 925 | # Never mind |
| 926 | 926 | $helptext = null; |
| 927 | 927 | } |
| Index: trunk/phase3/includes/api/ApiQueryTags.php |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | |
| 118 | 118 | if ( $this->fld_description ) { |
| 119 | 119 | $msg = wfMsg( "tag-$tagName-description" ); |
| 120 | | - $msg = wfEmptyMsg( "tag-$tagName-description", $msg ) ? '' : $msg; |
| | 120 | + $msg = wfEmptyMsg( "tag-$tagName-description" ) ? '' : $msg; |
| 121 | 121 | $tag['description'] = $msg; |
| 122 | 122 | } |
| 123 | 123 | |
| Index: trunk/phase3/includes/specials/SpecialStatistics.php |
| — | — | @@ -198,13 +198,13 @@ |
| 199 | 199 | } |
| 200 | 200 | $groupname = htmlspecialchars( $group ); |
| 201 | 201 | $msg = wfMsg( 'group-' . $groupname ); |
| 202 | | - if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) { |
| | 202 | + if ( wfEmptyMsg( 'group-' . $groupname ) || $msg == '' ) { |
| 203 | 203 | $groupnameLocalized = $groupname; |
| 204 | 204 | } else { |
| 205 | 205 | $groupnameLocalized = $msg; |
| 206 | 206 | } |
| 207 | 207 | $msg = wfMsgForContent( 'grouppage-' . $groupname ); |
| 208 | | - if ( wfEmptyMsg( 'grouppage-' . $groupname, $msg ) || $msg == '' ) { |
| | 208 | + if ( wfEmptyMsg( 'grouppage-' . $groupname ) || $msg == '' ) { |
| 209 | 209 | $grouppageLocalized = MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname; |
| 210 | 210 | } else { |
| 211 | 211 | $grouppageLocalized = $msg; |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -225,7 +225,7 @@ |
| 226 | 226 | // languages that want to put the "for" bit right after $user but before |
| 227 | 227 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| 228 | 228 | // otherwise use 'contribsub2'. |
| 229 | | - if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) { |
| | 229 | + if( wfEmptyMsg( 'contribsub' ) ) { |
| 230 | 230 | return wfMsgHtml( 'contribsub2', $user, $links ); |
| 231 | 231 | } else { |
| 232 | 232 | return wfMsgHtml( 'contribsub', "$user ($links)" ); |
| — | — | @@ -397,7 +397,7 @@ |
| 398 | 398 | Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) |
| 399 | 399 | ) . ' '; |
| 400 | 400 | $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' ); |
| 401 | | - if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) ) { |
| | 401 | + if( !wfEmptyMsg( 'sp-contributions-explain' ) ) { |
| 402 | 402 | $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>"; |
| 403 | 403 | } |
| 404 | 404 | $f .= Xml::closeElement('fieldset' ) . |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | // languages that want to put the "for" bit right after $user but before |
| 455 | 455 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| 456 | 456 | // otherwise use 'contribsub2'. |
| 457 | | - if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) { |
| | 457 | + if( wfEmptyMsg( 'contribsub' ) ) { |
| 458 | 458 | return wfMsgHtml( 'contribsub2', $user, $links ); |
| 459 | 459 | } else { |
| 460 | 460 | return wfMsgHtml( 'contribsub', "$user ($links)" ); |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1424,11 +1424,11 @@ |
| 1425 | 1425 | |
| 1426 | 1426 | $text = wfMsgExt( $line[1], 'parsemag' ); |
| 1427 | 1427 | |
| 1428 | | - if ( wfEmptyMsg( $line[1], $text ) ) { |
| | 1428 | + if ( wfEmptyMsg( $line[1] ) ) { |
| 1429 | 1429 | $text = $line[1]; |
| 1430 | 1430 | } |
| 1431 | 1431 | |
| 1432 | | - if ( wfEmptyMsg( $line[0], $link ) ) { |
| | 1432 | + if ( wfEmptyMsg( $line[0] ) ) { |
| 1433 | 1433 | $link = $line[0]; |
| 1434 | 1434 | } |
| 1435 | 1435 | |