| Index: trunk/phase3/includes/SpecialUndelete.php |
| — | — | @@ -604,17 +604,24 @@ |
| 605 | 605 | $archive = new PageArchive( $this->mTargetObj ); |
| 606 | 606 | $rev = $archive->getRevision( $timestamp ); |
| 607 | 607 | |
| 608 | | - $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); |
| 609 | | - $link = $skin->makeKnownLinkObj( $self, htmlspecialchars( $this->mTargetObj->getPrefixedText() ), |
| 610 | | - 'target=' . $this->mTargetObj->getPrefixedUrl() ); |
| 611 | | - $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, |
| 612 | | - htmlspecialchars( $wgLang->timeAndDate( $timestamp ) ) ) . '</p>' ); |
| 613 | | - |
| 614 | 608 | if( !$rev ) { |
| 615 | | - $wgOut->addWikiText( wfMsg( 'undeleterevision-missing' ) ); |
| | 609 | + $wgOut->addWikiTexT( wfMsg( 'undeleterevision-missing' ) ); |
| 616 | 610 | return; |
| 617 | 611 | } |
| 618 | 612 | |
| | 613 | + $wgOut->setPageTitle( wfMsg( 'undeletepage' ) ); |
| | 614 | + |
| | 615 | + $link = $skin->makeKnownLinkObj( |
| | 616 | + $self, |
| | 617 | + htmlspecialchars( $this->mTargetObj->getPrefixedText() ), |
| | 618 | + 'target=' . $this->mTargetObj->getPrefixedUrl() |
| | 619 | + ); |
| | 620 | + $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp ) ); |
| | 621 | + $user = $skin->userLink( $rev->getUser(), $rev->getUserText() ) |
| | 622 | + . $skin->userToolLinks( $rev->getUser(), $rev->getUserText() ); |
| | 623 | + |
| | 624 | + $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '</p>' ); |
| | 625 | + |
| 619 | 626 | wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) ); |
| 620 | 627 | |
| 621 | 628 | if( $this->mPreview ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1895,7 +1895,7 @@ |
| 1896 | 1896 | 'undeletehistorynoadmin' => 'This article has been deleted. The reason for deletion is |
| 1897 | 1897 | shown in the summary below, along with details of the users who had edited this page |
| 1898 | 1898 | before deletion. The actual text of these deleted revisions is only available to administrators.', |
| 1899 | | -'undelete-revision' => 'Deleted revision of $1 from $2:', |
| | 1899 | +'undelete-revision' => 'Deleted revision of $1 (as of $2) by $3:', |
| 1900 | 1900 | 'undeleterevision-missing' => 'Invalid or missing revision. You may have a bad link, or the |
| 1901 | 1901 | revision may have been restored or removed from the archive.', |
| 1902 | 1902 | 'undeletebtn' => 'Restore', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -169,6 +169,7 @@ |
| 170 | 170 | * (bug 10826) Added link trail with Cyrillic characters for Mongolian language |
| 171 | 171 | * (bug 10859) Introduce 'UserGetImplicitGroups' hook; see docs/hooks.txt for |
| 172 | 172 | more information |
| | 173 | +* (bug 10832) Include user information when viewing a deleted revision |
| 173 | 174 | |
| 174 | 175 | == Bugfixes since 1.10 == |
| 175 | 176 | |