| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -403,8 +403,8 @@ |
| 404 | 404 | Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' . |
| 405 | 405 | Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) |
| 406 | 406 | ) . ' '; |
| 407 | | - $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' ); |
| 408 | | - if( !wfEmptyMsg( 'sp-contributions-explain' ) ) { |
| | 407 | + $explain = wfMessage( 'sp-contributions-explain' ); |
| | 408 | + if ( $explain->exists() ) { |
| 409 | 409 | $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>"; |
| 410 | 410 | } |
| 411 | 411 | $f .= Xml::closeElement('fieldset' ) . |
| Index: trunk/phase3/languages/LanguageConverter.php |
| — | — | @@ -531,9 +531,9 @@ |
| 532 | 532 | $text = ''; |
| 533 | 533 | } else { |
| 534 | 534 | // first let's check if a message has given us a converted name |
| 535 | | - $nsConvKey = 'conversion-ns' . $index; |
| 536 | | - if ( !wfEmptyMsg( $nsConvKey ) ) { |
| 537 | | - $text = wfMsgForContentNoTrans( $nsConvKey ); |
| | 535 | + $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inContentLanguage(); |
| | 536 | + if ( $nsConvMsg->exists() ) { |
| | 537 | + $text = $nsConvMsg->plain(); |
| 538 | 538 | } else { |
| 539 | 539 | // the message does not exist, try retrieve it from the current |
| 540 | 540 | // variant's namespace names. |