| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | protected function showConvenienceLinks() { |
| 185 | 185 | global $wgOut, $wgUser, $wgLang; |
| 186 | 186 | # Give a link to the logs/hist for this page |
| 187 | | - if( $this->targetObj && $this->targetObj->getNamespace() != NS_SPECIAL ) { |
| | 187 | + if( $this->targetObj ) { |
| 188 | 188 | $links = array(); |
| 189 | 189 | $logtitle = SpecialPage::getTitleFor( 'Log' ); |
| 190 | 190 | $links[] = $this->skin->linkKnown( |
| — | — | @@ -192,22 +192,24 @@ |
| 193 | 193 | array(), |
| 194 | 194 | array( 'page' => $this->targetObj->getPrefixedText() ) |
| 195 | 195 | ); |
| 196 | | - # Give a link to the page history |
| 197 | | - $links[] = $this->skin->linkKnown( |
| 198 | | - $this->targetObj, |
| 199 | | - wfMsgHtml( 'pagehist' ), |
| 200 | | - array(), |
| 201 | | - array( 'action' => 'history' ) |
| 202 | | - ); |
| 203 | | - # Link to deleted edits |
| 204 | | - if( $wgUser->isAllowed('undelete') ) { |
| 205 | | - $undelete = SpecialPage::getTitleFor( 'Undelete' ); |
| | 196 | + if ( $this->targetObj->getNamespace() != NS_SPECIAL ) { |
| | 197 | + # Give a link to the page history |
| 206 | 198 | $links[] = $this->skin->linkKnown( |
| 207 | | - $undelete, |
| 208 | | - wfMsgHtml( 'deletedhist' ), |
| | 199 | + $this->targetObj, |
| | 200 | + wfMsgHtml( 'pagehist' ), |
| 209 | 201 | array(), |
| 210 | | - array( 'target' => $this->targetObj->getPrefixedDBkey() ) |
| | 202 | + array( 'action' => 'history' ) |
| 211 | 203 | ); |
| | 204 | + # Link to deleted edits |
| | 205 | + if( $wgUser->isAllowed('undelete') ) { |
| | 206 | + $undelete = SpecialPage::getTitleFor( 'Undelete' ); |
| | 207 | + $links[] = $this->skin->linkKnown( |
| | 208 | + $undelete, |
| | 209 | + wfMsgHtml( 'deletedhist' ), |
| | 210 | + array(), |
| | 211 | + array( 'target' => $this->targetObj->getPrefixedDBkey() ) |
| | 212 | + ); |
| | 213 | + } |
| 212 | 214 | } |
| 213 | 215 | # Logs themselves don't have histories or archived revisions |
| 214 | 216 | $wgOut->setSubtitle( '<p>' . $wgLang->pipeList( $links ) . '</p>' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -432,8 +432,8 @@ |
| 433 | 433 | DatabaseBase::getFlag() now have documentation |
| 434 | 434 | * (bug 19966) MediaWiki:License-header is now used for the licensing header in |
| 435 | 435 | the file description page instead of MediaWiki:License |
| 436 | | -* (bug 20380) Link to history/log action at the top of Special:RevisionDelete |
| 437 | | - are new more displayed when when doing log suppression |
| | 436 | +* (bug 20380) Links to history/deleted edits at the top of |
| | 437 | + Special:RevisionDelete are no more displayed when when doing log suppression |
| 438 | 438 | * (bug 8143) Localised parser function names are now correctly case insensitive |
| 439 | 439 | if they contain non-ASCII characters |
| 440 | 440 | |