diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:47 -0400 |
| commit | 7e85254903c7c0cb49e381f16b18441ea7b058cc (patch) | |
| tree | b22328fcf4c8408fc25a7acb73d1cb1089cd82ac /includes/specials | |
| parent | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (diff) | |
| parent | 1a365e77dfb8825136626202b1df462731b42060 (diff) | |
Merge commit '1a365e'
Diffstat (limited to 'includes/specials')
| -rw-r--r-- | includes/specials/SpecialDeletedContributions.php | 2 | ||||
| -rw-r--r-- | includes/specials/SpecialVersion.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index 9e4bbbe5..fb85942d 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -479,7 +479,7 @@ class DeletedContributionsPage extends SpecialPage { if ( ( $id !== null ) || ( $id === null && IP::isIPAddress( $nt->getText() ) ) ) { # Block / Change block / Unblock links if ( $this->getUser()->isAllowed( 'block' ) ) { - if ( $userObj->isBlocked() ) { + if ( $userObj->isBlocked() && $userObj->getBlock()->getType() !== Block::TYPE_AUTO ) { $tools[] = Linker::linkKnown( # Change block link SpecialPage::getTitleFor( 'Block', $nt->getDBkey() ), $this->msg( 'change-blocklink' )->escaped() diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index c1a95939..9a1c5e5d 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -265,8 +265,8 @@ class SpecialVersion extends SpecialPage { $version = $wgVersion . ' ' . wfMessage( 'version-svn-revision', - isset( $info['directory-rev'] ) ? $info['directory-rev'] : '', - $info['checkout-rev'] + isset( $svnInfo['directory-rev'] ) ? $svnInfo['directory-rev'] : '', + isset( $svnInfo['checkout-rev'] ) ? $svnInfo['checkout-rev'] : '' )->text(); } |