(bug 7842) Link back to deleted revision list from deleted revision preview

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 491b896..c884b95 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -66,7 +66,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Made Linker::userToolLinks() show the contribs link red when the user has zero edits
 * Use browser default for printing size, don't force to 11pt
 * (bug 8632) Fix regression in page protection null edit update
-
+* (bug 7842) Link back to deleted revision list from deleted revision preview
 
 == Languages updated ==
 

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 3cdda78..a156b97 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -513,15 +513,19 @@ class UndeleteForm {
 
        /* private */ function showRevision( $timestamp ) {
                global $wgLang, $wgUser, $wgOut;
+               $self = SpecialPage::getTitleFor( 'Undelete' );
+               $skin = $wgUser->getSkin();
 
                if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
 
                $archive = new PageArchive( $this->mTargetObj );
                $rev = $archive->getRevision( $timestamp );
                
-               $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-               $wgOut->addWikiText( "(" . wfMsg( "undeleterevision",
-                       $wgLang->timeAndDate( $timestamp ) ) . ")\n" );
+               $wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
+               $link = $skin->makeKnownLinkObj( $self, htmlspecialchars( $this->mTargetObj->getPrefixedText() ),
+                                       'target=' . $this->mTargetObj->getPrefixedUrl() );
+               $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link,
+                       htmlspecialchars( $wgLang->timeAndDate( $timestamp ) ) ) . '</p>' ); 
                
                if( !$rev ) {
                        $wgOut->addWikiText( wfMsg( 'undeleterevision-missing' ) );
@@ -534,9 +538,7 @@ class UndeleteForm {
                        $wgOut->addHtml( "<hr />\n" );
                        $wgOut->addWikiTextTitle( $rev->getText(), $archive->title, false );
                }
-               
-               $self = SpecialPage::getTitleFor( "Undelete" );
-               
+
                $wgOut->addHtml(
                        wfElement( 'textarea', array(
                                        'readonly' => true,

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 26ca3c0..ad090e6 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1775,7 +1775,7 @@ will not be automatically replaced.',
 'undeletehistorynoadmin' => 'This article has been deleted. The reason for deletion is
 shown in the summary below, along with details of the users who had edited this page
 before deletion. The actual text of these deleted revisions is only available to administrators.',
-'undeleterevision' => "Deleted revision as of $1",
+'undelete-revision' => 'Deleted revision of $1 from $2:',
 'undeleterevision-missing' => "Invalid or missing revision. You may have a bad link, or the
 revision may have been restored or removed from the archive.",
 'undeletebtn' => 'Restore',