X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUndelete.php;h=56920b32b1ceac8ef48336d7b03115d0423b47fb;hb=900843f7ee9131ebdbe839fafffb70b8e293a8b9;hp=04f5be46ca4c61dc0e6f0f0a992e5272f23547be;hpb=b01d54e5981da34bf0ce6856e56d3841d71e8686;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 04f5be46ca..56920b32b1 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -21,6 +21,7 @@
  * @ingroup SpecialPage
  */
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * Used to show archived pages and eventually restore them.
@@ -465,7 +466,7 @@ class PageArchive {
 
 		# Does this page already exist? We'll have to update it...
 		$article = WikiPage::factory( $this->title );
-		# Load latest data for the current page (bug 31179)
+		# Load latest data for the current page (T33179)
 		$article->loadPageData( 'fromdbmaster' );
 		$oldcountable = $article->isCountable();
 
@@ -1141,8 +1142,8 @@ class SpecialUndelete extends SpecialPage {
 				'textarea',
 				[
 					'readonly' => 'readonly',
-					'cols' => $user->getIntOption( 'cols' ),
-					'rows' => $user->getIntOption( 'rows' )
+					'cols' => 80,
+					'rows' => 25
 				],
 				$content->getNativeData() . "\n"
 			);
@@ -1806,11 +1807,9 @@ class SpecialUndelete extends SpecialPage {
 		// Show revision undeletion warnings and errors
 		$status = $archive->getRevisionStatus();
 		if ( $status && !$status->isGood() ) {
-			$out->addWikiText( '<div class="error">' .
-				$status->getWikiText(
-					'cannotundelete',
-					'cannotundelete'
-				) . '</div>'
+			$out->wrapWikiMsg(
+				"<div class=\"error\" id=\"mw-error-cannotundelete\">\n$1\n</div>",
+				'cannotundelete'
 			);
 		}