| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -752,7 +752,7 @@ |
| 753 | 753 | } |
| 754 | 754 | } else { |
| 755 | 755 | //article doesn't exist or is deleted |
| 756 | | - if( $wgUser->isAllowed( 'delete' ) ) { |
| | 756 | + if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) { |
| 757 | 757 | if( $n = $this->mTitle->isDeleted() ) { |
| 758 | 758 | $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); |
| 759 | 759 | $content_actions['undelete'] = array( |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -784,7 +784,7 @@ |
| 785 | 785 | (($wgTitle->getArticleId() == 0) || ($action == "history")) && |
| 786 | 786 | ($n = $wgTitle->isDeleted() ) ) |
| 787 | 787 | { |
| 788 | | - if ( $wgUser->isAllowed( 'delete' ) ) { |
| | 788 | + if ( $wgUser->isAllowed( 'undelete' ) ) { |
| 789 | 789 | $msg = 'thisisdeleted'; |
| 790 | 790 | } else { |
| 791 | 791 | $msg = 'viewdeleted'; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -272,6 +272,7 @@ |
| 273 | 273 | * (bug 12416) Fix password setting for createAndPromote.php |
| 274 | 274 | * (bug 3097) Inconsistently usable titles containing HTML character entities |
| 275 | 275 | are now forbidden. A run of cleanupTitles.php will fix up existing pages. |
| | 276 | +* (bug 12446) Permissions check fix for undelete link |
| 276 | 277 | |
| 277 | 278 | |
| 278 | 279 | == Parser changes in 1.12 == |