From e71a915538d99506098253bbc187bb65f9001904 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 9 Jan 2008 01:08:59 +0000
Subject: [PATCH] * (bug 12553) Fixed invalid XHTML in edit conflict screen

---
 RELEASE-NOTES         | 1 +
 includes/EditPage.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3495ffc278..45bdc1a1e6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -291,6 +291,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Fixes 'root'-style rewrite configurations
 * (bug 12493) Removed hardcoded MAX_FILE_SIZE from Special:Import upload form
 * (bug 12489) Special:Userrights listed in restricted section again
+* (bug 12553) Fixed invalid XHTML in edit conflict screen
 
 
 == Parser changes in 1.12 ==
diff --git a/includes/EditPage.php b/includes/EditPage.php
index cd028e21ca..4846196d93 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1352,7 +1352,7 @@ END
 			$de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
 
 			$wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' );
-			$wgOut->addHTML( "<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
+			$wgOut->addHTML( "<textarea tabindex='6' id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}'>"
 				. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) . "\n</textarea>" );
 		}
 		$wgOut->addHTML( $this->editFormTextBottom );
-- 
2.20.1