| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -170,11 +170,13 @@ |
| 171 | 171 | $qc = $this->getLogQueryCond(); |
| 172 | 172 | # Show relevant lines from the deletion log |
| 173 | 173 | $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" ); |
| 174 | | - LogEventsList::showLogExtract( $wgOut, 'delete', $this->targetObj->getPrefixedText(), '', 25, $qc ); |
| | 174 | + LogEventsList::showLogExtract( $wgOut, 'delete', |
| | 175 | + $this->targetObj->getPrefixedText(), '', 25, $qc ); |
| 175 | 176 | # Show relevant lines from the suppression log |
| 176 | 177 | if( $wgUser->isAllowed( 'suppressionlog' ) ) { |
| 177 | 178 | $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'suppress' ) ) . "</h2>\n" ); |
| 178 | | - LogEventsList::showLogExtract( $wgOut, 'suppress', $this->targetObj->getPrefixedText(), '', 25, $qc ); |
| | 179 | + LogEventsList::showLogExtract( $wgOut, 'suppress', |
| | 180 | + $this->targetObj->getPrefixedText(), '', 25, $qc ); |
| 179 | 181 | } |
| 180 | 182 | } |
| 181 | 183 | |
| — | — | @@ -293,7 +295,8 @@ |
| 294 | 296 | if ( $this->typeName == 'logging' ) { |
| 295 | 297 | $wgOut->addWikiMsg( 'logdelete-selected', $wgLang->formatNum( count($this->ids) ) ); |
| 296 | 298 | } else { |
| 297 | | - $wgOut->addWikiMsg( 'revdelete-selected', $this->targetObj->getPrefixedText(), count( $this->ids ) ); |
| | 299 | + $wgOut->addWikiMsg( 'revdelete-selected', |
| | 300 | + $this->targetObj->getPrefixedText(), count( $this->ids ) ); |
| 298 | 301 | } |
| 299 | 302 | |
| 300 | 303 | $bitfields = 0; |
| — | — | @@ -644,7 +647,8 @@ |
| 645 | 648 | $opType = 'modify'; |
| 646 | 649 | } |
| 647 | 650 | |
| 648 | | - if ( $item->isCurrent() && $opType == 'hide' ) { |
| | 651 | + // TODO: use FILE::DELETED_FILE, though value is the same |
| | 652 | + if ( $item->isCurrent() && ($newBits & Revision::DELETED_TEXT) ) { |
| 649 | 653 | // Cannot hide current version text |
| 650 | 654 | $status->error( 'revdelete-hide-current', $item->formatDate(), $item->formatTime() ); |
| 651 | 655 | $status->failCount++; |