From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 4 Apr 2009 20:05:06 +0000 (+0000)
Subject: * (bug 18331) MediaWiki:Undelete-revision can now have wikitext
X-Git-Tag: 1.31.0-rc.0~42227
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=27a47c3491cb2dacec939f25f1b3583ead6ebc7e;p=lhc%2Fweb%2Fwiklou.git

* (bug 18331) MediaWiki:Undelete-revision can now have wikitext
* Wrapped MediaWiki:Undelete-revision arround a <div class="mw-warning"> when previewing and removed the <hr /> after it

Based on a patch by Happy-melon: http://bug-attachment.wikimedia.org/attachment.cgi?id=5988
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 941167c6d9..3c1aca0205 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -323,6 +323,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   skins
 * Fixed a PHP notice when $wgEnableSerializedMessages was set to false
 * (bug 18316) Removed superfluous name="fulltext" from Special:Search
+* (bug 18331) MediaWiki:Undelete-revision can now have wikitext
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index c47f43a0ee..a9fa3b7461 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -642,7 +642,7 @@ class UndeleteForm {
 					$this->showList( $result );
 				}
 			} else {
-				$wgOut->addWikiText( wfMsgHtml( 'undelete-header' ) );
+				$wgOut->addWikiMsg( 'undelete-header' );
 			}
 			return;
 		}
@@ -763,7 +763,7 @@ class UndeleteForm {
 					$wgOut->addHTML( '<hr />' );
 				}
 			} else {
-				$wgOut->addHTML( wfMsgHtml( 'undelete-nodiff' ) );
+				$wgOut->addWikiMsg( 'undelete-nodiff' );
 			}
 		}
 
@@ -774,13 +774,16 @@ class UndeleteForm {
 		$t = htmlspecialchars( $wgLang->time( $timestamp, true ) );
 		$user = $skin->revUserTools( $rev );
 
-		$wgOut->addHTML( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</p>' );
+		if( $this->mPreview ) {
+			$openDiv = '<div id="mw-undelete-revision" class="mw-warning">';
+		} else {
+			$openDiv = '<div id="mw-undelete-revision">';
+		}
 
+		$wgOut->addHTML( $openDiv . wfMsgWikiHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</div>' );
 		wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
 
 		if( $this->mPreview ) {
-			$wgOut->addHTML( "<hr />\n" );
-
 			//Hide [edit]s
 			$popts = $wgOut->parserOptions();
 			$popts->setEditSection( false );
@@ -941,7 +944,7 @@ class UndeleteForm {
 			$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
 		}
 
-		$wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) );
+		$wgOut->addWikiMsg( 'undeletepagetitle', $this->mTargetObj->getPrefixedText() );
 
 		$archive = new PageArchive( $this->mTargetObj );
 		/*