From 5cfdfc467b71c518c7629a7315a0fcdaba1b99c2 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 27 Jun 2008 11:01:04 +0000
Subject: [PATCH] Don't allow contentless tags for <textarea>

---
 includes/Xml.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/Xml.php b/includes/Xml.php
index ac443482aa..7db9ee8cca 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -14,9 +14,10 @@ class Xml {
 	 * @param $element String: element name
 	 * @param $attribs Array: Name=>value pairs. Values will be escaped.
 	 * @param $contents String: NULL to make an open tag only; '' for a contentless closed tag (default)
+	 * @param $allowShortTag Bool: whether '' in $contents will result in a contentless closed tag
 	 * @return string
 	 */
-	public static function element( $element, $attribs = null, $contents = '') {
+	public static function element( $element, $attribs = null, $contents = '', $allowShortTag = true ) {
 		$out = '<' . $element;
 		if( !is_null( $attribs ) ) {
 			$out .=  self::expandAttributes( $attribs );
@@ -24,7 +25,7 @@ class Xml {
 		if( is_null( $contents ) ) {
 			$out .= '>';
 		} else {
-			if( $contents === '' ) {
+			if( $allowShortTag && $contents === '' ) {
 				$out .= ' />';
 			} else {
 				$out .= '>' . htmlspecialchars( $contents ) . "</$element>";
@@ -489,7 +490,7 @@ class Xml {
 						'cols' => $cols,
 						'rows' => $rows
 					) + $attribs,
-					$content."\n" );
+					$content, false );
 	}
 
 	/**
-- 
2.20.1