From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 9 May 2008 18:53:54 +0000 (+0000)
Subject: Ensure there's a newline at the end of the editing <textarea>, otherwise adding lines... 
X-Git-Tag: 1.31.0-rc.0~47772
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=adece199d4f5ce4f949d17722cb58fa32117fd75;p=lhc%2Fweb%2Fwiklou.git

Ensure there's a newline at the end of the editing <textarea>, otherwise adding lines is awkward.
But don't add a newline if the ext is empty, or Firefox in XHTML mode will show an extra newline. A bit annoying, and drives me nuts while I'm testing. :D
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 412b0bd941..3efd454e82 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1335,18 +1335,24 @@ END
 <input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n
 <input type='hidden' value=\"{$this->scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" );
 
+		$encodedtext = htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) );
+		if( $encodedtext !== '' ) {
+			// Ensure there's a newline at the end, otherwise adding lines
+			// is awkward.
+			// But don't add a newline if the ext is empty, or Firefox in XHTML
+			// mode will show an extra newline. A bit annoying.
+			$encodedtext .= "\n";
+		}
+
 		$wgOut->addHTML( <<<END
 $recreate
 {$commentsubject}
 {$subjectpreview}
 {$this->editFormTextBeforeContent}
 <textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}'
-cols='{$cols}'{$ew} $hidden>
+cols='{$cols}'{$ew} $hidden>{$encodedtext}</textarea>
 END
-. htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) .
-"
-</textarea>
-		" );
+);
 
 		$wgOut->wrapWikiMsg( "<div id=\"editpage-copywarn\">\n$1\n</div>", $copywarnMsg );
 		$wgOut->addHTML( $this->editFormTextAfterWarn );