| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -218,7 +218,7 @@ |
| 219 | 219 | if( wfEmptyMsg( $message, $text ) ) |
| 220 | 220 | $text = ''; |
| 221 | 221 | } else { |
| 222 | | - $text = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ); |
| | 222 | + $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' ); |
| 223 | 223 | } |
| 224 | 224 | wfProfileOut( __METHOD__ ); |
| 225 | 225 | return $text; |
| — | — | @@ -831,14 +831,16 @@ |
| 832 | 832 | $this->showDeletionLog(); |
| 833 | 833 | } |
| 834 | 834 | $text = $this->getContent(); |
| 835 | | - if( $text === false ) { |
| | 835 | + // For now, check also for ID until getContent actually returns |
| | 836 | + // false for pages that do not exists |
| | 837 | + if( $text === false || $this->getID() === 0 ) { |
| 836 | 838 | # Failed to load, replace text with error message |
| 837 | 839 | $t = $this->mTitle->getPrefixedText(); |
| 838 | 840 | if( $oldid ) { |
| 839 | | - $d = wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid ); |
| 840 | | - $text = wfMsg( 'missing-article', $t, $d ); |
| | 841 | + $d = wfMsgExt( 'missingarticle-rev', 'escape', $oldid ); |
| | 842 | + $text = wfMsgExt( 'missing-article', 'parsemag', $t, $d ); |
| 841 | 843 | } else { |
| 842 | | - $text = wfMsg( 'noarticletext' ); |
| | 844 | + $text = wfMsgExt( 'noarticletext', 'parsemag' ); |
| 843 | 845 | } |
| 844 | 846 | } |
| 845 | 847 | |