* (bug 12553) Fixed invalid XHTML in edit conflict screen

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3495ffc..45bdc1a 100644 (file)
--- 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 cd028e2..4846196 100644 (file)
--- 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 );