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

A few cleanups for r58351

Browse source
This commit is contained in:
Aaron Schulz 2009-10-30 02:23:58 +00:00
parent 90dcb3c1f2
commit e07adc0e3c
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Article.php
View file

@ -3456,11 +3456,10 @@ class Article {
$cdel = '';
// User can delete revisions or view deleted revisions...
$canHide = $wgUser->isAllowed('deleterevision');
$canHide = $wgUser->isAllowed( 'deleterevision' );
if( $canHide || ($revision->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
// Is this hidden from Sysops?
if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
$cdel = $sk->revDeleteLinkDisabled( $canHide );
$cdel = $sk->revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
} else {
$query = array(
'type' => 'revision',

60
includes/diff/DifferenceInterface.php
View file

@ -312,40 +312,38 @@ CONTROL;
$newminor = ChangesList::flag( 'minor' );
}
$rdel = ''; $ldel = '';
$rdel = $ldel = '';
# Handle RevisionDelete links...
if( $wgUser->isAllowed( 'deletedhistory' ) ) {
$canHide = $wgUser->isAllowed( 'deleterevision' );
// Don't show useless link to people who cannot hide revisions
if( $canHide || $this->mOldRev->getVisibility() ) {
if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
$ldel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
$query = array(
'type' => 'revision',
'target' => $this->mOldRev->mTitle->getPrefixedDbkey(),
'ids' => $this->mOldRev->getId()
);
$ldel = $sk->revDeleteLink( $query,
$this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
$ldel = "   $ldel ";
$canHide = $wgUser->isAllowed( 'deleterevision' );
// Don't show useless link to people who cannot hide revisions
if( $canHide || ($this->mOldRev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
$ldel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
$query = array(
'type' => 'revision',
'target' => $this->mOldRev->mTitle->getPrefixedDbkey(),
'ids' => $this->mOldRev->getId()
);
$ldel = $sk->revDeleteLink( $query,
$this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
// Don't show useless link to people who cannot hide revisions
if( $this->mNewRev->getVisibility() || $wgUser->isAllowed( 'deleterevision' ) ) {
if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
$rdel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
$query = array(
'type' => 'revision',
'target' => $this->mNewRev->mTitle->getPrefixedDbkey(),
'ids' => $this->mNewRev->getId()
);
$rdel = $sk->revDeleteLink( $query,
$this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
$rdel = "   $rdel ";
$ldel = "   $ldel ";
}
// Don't show useless link to people who cannot hide revisions
if( $canHide || ($this->mNewRev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
$rdel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
$query = array(
'type' => 'revision',
'target' => $this->mNewRev->mTitle->getPrefixedDbkey(),
'ids' => $this->mNewRev->getId()
);
$rdel = $sk->revDeleteLink( $query,
$this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
$rdel = "   $rdel ";
}
$oldHeader = '<div id="mw-diff-otitle1"><strong>'.$this->mOldtitle.'</strong></div>' .