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

Merge "For consistency of the interface, don't do expensive checks on page view."

Browse source
This commit is contained in:
Aaron Schulz 2012-06-19 06:53:07 +00:00 committed by Gerrit Code Review
commit 18dc076fa2
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/Article.php
View file

@ -1050,16 +1050,12 @@ class Article extends Page {
} elseif ( $this->getTitle()->getNamespace() === NS_MEDIAWIKI ) {
// Use the default message text
$text = $this->getTitle()->getDefaultMessageText();
} elseif ( $this->getTitle()->quickUserCan( 'create', $this->getContext()->getUser() )
&& $this->getTitle()->quickUserCan( 'edit', $this->getContext()->getUser() )
) {
$text = wfMsgNoTrans( 'noarticletext' );
} else {
$createErrors = $this->getTitle()->getUserPermissionsErrors( 'create', $this->getContext()->getUser() );
$editErrors = $this->getTitle()->getUserPermissionsErrors( 'edit', $this->getContext()->getUser() );
$errors = array_merge( $createErrors, $editErrors );
if ( !count( $errors ) ) {
$text = wfMsgNoTrans( 'noarticletext' );
} else {
$text = wfMsgNoTrans( 'noarticletext-nopermission' );
}
$text = wfMsgNoTrans( 'noarticletext-nopermission' );
}
$text = "<div class='noarticletext'>\n$text\n</div>";