Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brr, Article::getContent still has "side effects"

Browse source
This commit is contained in:
Niklas Laxström 2009-01-12 08:11:22 +00:00
parent 926fd3ac20
commit b50935d3bf
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/Article.php
View file

@ -218,7 +218,7 @@ class Article {
if( wfEmptyMsg( $message, $text ) )
$text = '';
} else {
$text = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
$text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' );
}
wfProfileOut( __METHOD__ );
return $text;
@ -831,14 +831,16 @@ class Article {
$this->showDeletionLog();
}
$text = $this->getContent();
if( $text === false ) {
// For now, check also for ID until getContent actually returns
// false for pages that do not exists
if( $text === false || $this->getID() === 0 ) {
# Failed to load, replace text with error message
$t = $this->mTitle->getPrefixedText();
if( $oldid ) {
$d = wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid );
$text = wfMsg( 'missing-article', $t, $d );
$d = wfMsgExt( 'missingarticle-rev', 'escape', $oldid );
$text = wfMsgExt( 'missing-article', 'parsemag', $t, $d );
} else {
$text = wfMsg( 'noarticletext' );
$text = wfMsgExt( 'noarticletext', 'parsemag' );
}
}