| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -447,10 +447,6 @@ |
| 448 | 448 | # For subclasses |
| 449 | 449 | $this->insertExtra( $s, $rc, $classes ); |
| 450 | 450 | |
| 451 | | - # Mark revision as deleted if so |
| 452 | | - if( !$rc->mAttribs['rc_log_type'] && $this->isDeleted($rc,Revision::DELETED_TEXT) ) { |
| 453 | | - $s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 454 | | - } |
| 455 | 451 | # How many users watch this page |
| 456 | 452 | if( $rc->numberofWatchingusers > 0 ) { |
| 457 | 453 | $s .= ' ' . wfMsgExt( 'number_of_watching_users_RCview', |
| — | — | @@ -865,11 +861,6 @@ |
| 866 | 862 | $this->insertRollback( $r, $rcObj ); |
| 867 | 863 | # Tags |
| 868 | 864 | $this->insertTags( $r, $rcObj, $classes ); |
| 869 | | - |
| 870 | | - # Mark revision as deleted |
| 871 | | - if( !$rc_log_type && $this->isDeleted($rcObj,Revision::DELETED_TEXT) ) { |
| 872 | | - $r .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 873 | | - } |
| 874 | 865 | |
| 875 | 866 | $r .= "</td></tr>\n"; |
| 876 | 867 | } |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -902,7 +902,6 @@ |
| 903 | 903 | array(), |
| 904 | 904 | $targetQuery |
| 905 | 905 | ) . |
| 906 | | - ( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) . |
| 907 | 906 | '</strong></div>' . |
| 908 | 907 | '<div id="mw-diff-'.$prefix.'title2">' . |
| 909 | 908 | $sk->revUserTools( $rev ) . '<br/>' . |
| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -599,7 +599,7 @@ |
| 600 | 600 | global $wgLang, $wgUser; |
| 601 | 601 | |
| 602 | 602 | $date = $wgLang->timeanddate( $rev->getTimestamp() ); |
| 603 | | - $difflink = $del = ''; |
| | 603 | + $difflink = ''; |
| 604 | 604 | // Live revisions |
| 605 | 605 | if( $this->deleteKey == 'oldid' ) { |
| 606 | 606 | $tokenParams = '&unhide=1&token='.urlencode( $wgUser->editToken( $rev->getId() ) ); |
| — | — | @@ -618,7 +618,6 @@ |
| 619 | 619 | // Check permissions; items may be "suppressed" |
| 620 | 620 | if( $rev->isDeleted(Revision::DELETED_TEXT) ) { |
| 621 | 621 | $revlink = '<span class="history-deleted">'.$revlink.'</span>'; |
| 622 | | - $del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 623 | 622 | if( !$rev->userCan(Revision::DELETED_TEXT) ) { |
| 624 | 623 | $revlink = '<span class="history-deleted">'.$date.'</span>'; |
| 625 | 624 | $difflink = '(' . wfMsgHtml('diff') . ')'; |
| — | — | @@ -627,7 +626,7 @@ |
| 628 | 627 | $userlink = $this->skin->revUserLink( $rev ); |
| 629 | 628 | $comment = $this->skin->revComment( $rev ); |
| 630 | 629 | |
| 631 | | - return "<li>$difflink $revlink $userlink $comment{$del}</li>"; |
| | 630 | + return "<li>$difflink $revlink $userlink $comment</li>"; |
| 632 | 631 | } |
| 633 | 632 | |
| 634 | 633 | /** |
| — | — | @@ -640,10 +639,8 @@ |
| 641 | 640 | $target = $this->page->getPrefixedText(); |
| 642 | 641 | $date = $wgLang->timeanddate( $file->getTimestamp(), true ); |
| 643 | 642 | |
| 644 | | - $del = ''; |
| 645 | 643 | # Hidden files... |
| 646 | 644 | if( $file->isDeleted(File::DELETED_FILE) ) { |
| 647 | | - $del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 648 | 645 | if( !$file->userCan(File::DELETED_FILE) ) { |
| 649 | 646 | $pageLink = $date; |
| 650 | 647 | } else { |
| — | — | @@ -663,7 +660,7 @@ |
| 664 | 661 | $data = htmlspecialchars( $data ); |
| 665 | 662 | |
| 666 | 663 | return "<li>$pageLink ".$this->fileUserTools( $file )." $data ". |
| 667 | | - $this->fileComment( $file )."$del</li>"; |
| | 664 | + $this->fileComment( $file )."</li>"; |
| 668 | 665 | } |
| 669 | 666 | |
| 670 | 667 | /** |
| — | — | @@ -680,18 +677,13 @@ |
| 681 | 678 | $pageLink = $this->skin->makeKnownLinkObj( $undelete, $date, |
| 682 | 679 | "target=$target&file={$file->getKey()}" ); |
| 683 | 680 | |
| 684 | | - $del = ''; |
| 685 | | - if( $file->isDeleted(File::DELETED_FILE) ) { |
| 686 | | - $del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 687 | | - } |
| 688 | | - |
| 689 | 681 | $data = wfMsg( 'widthheight', $wgLang->formatNum( $file->getWidth() ), |
| 690 | 682 | $wgLang->formatNum( $file->getHeight() ) ) . |
| 691 | 683 | ' (' . wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $file->getSize() ) ) . ')'; |
| 692 | 684 | $data = htmlspecialchars( $data ); |
| 693 | 685 | |
| 694 | 686 | return "<li>$pageLink ".$this->fileUserTools( $file )." $data ". |
| 695 | | - $this->fileComment( $file )."$del</li>"; |
| | 687 | + $this->fileComment( $file )."</li>"; |
| 696 | 688 | } |
| 697 | 689 | |
| 698 | 690 | /** |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -554,9 +554,6 @@ |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | $ret = "{$del}{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; |
| 558 | | - if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { |
| 559 | | - $ret .= ' ' . wfMsgHtml( 'deletedrev' ); |
| 560 | | - } |
| 561 | 558 | |
| 562 | 559 | # Tags, if any. |
| 563 | 560 | list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'contributions' ); |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -180,9 +180,6 @@ |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | $ret = "{$del}{$link} ({$last}) ({$dellog}) ({$reviewlink}) . . {$mflag} {$pagelink} {$comment}"; |
| 184 | | - if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { |
| 185 | | - $ret .= ' ' . wfMsgHtml( 'deletedrev' ); |
| 186 | | - } |
| 187 | 184 | |
| 188 | 185 | $ret = "<li>$ret</li>\n"; |
| 189 | 186 | |
| Index: trunk/phase3/includes/PageHistory.php |
| — | — | @@ -320,19 +320,18 @@ |
| 321 | 321 | if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) { |
| 322 | 322 | $s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>'; |
| 323 | 323 | } |
| 324 | | - if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { |
| 325 | | - $s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>'; |
| 326 | | - } |
| 327 | 324 | |
| 328 | 325 | $tools = array(); |
| 329 | 326 | |
| 330 | 327 | if( !is_null( $next ) && is_object( $next ) ) { |
| 331 | 328 | if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) { |
| 332 | | - $tools[] = '<span class="mw-rollback-link">'.$this->mSkin->buildRollbackLink( $rev ).'</span>'; |
| | 329 | + $tools[] = '<span class="mw-rollback-link">'. |
| | 330 | + $this->mSkin->buildRollbackLink( $rev ).'</span>'; |
| 333 | 331 | } |
| 334 | 332 | |
| 335 | | - if( $this->mTitle->quickUserCan( 'edit' ) && !$rev->isDeleted( Revision::DELETED_TEXT ) && |
| 336 | | - !$next->rev_deleted & Revision::DELETED_TEXT ) |
| | 333 | + if( $this->mTitle->quickUserCan( 'edit' ) |
| | 334 | + && !$rev->isDeleted( Revision::DELETED_TEXT ) |
| | 335 | + && !$next->rev_deleted & Revision::DELETED_TEXT ) |
| 337 | 336 | { |
| 338 | 337 | # Create undo tooltip for the first (=latest) line only |
| 339 | 338 | $undoTooltip = $latest |