From: Pcoombe <pcoombe@wikimedia.org>
Date: Tue, 15 Apr 2014 14:58:51 +0000 (+0100)
Subject: HTMLForm: fix double escaping of checkbox labels in vform
X-Git-Tag: 1.31.0-rc.0~15589
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=16b731dc575290c52ec4962f320f677866d59f55;p=lhc%2Fweb%2Fwiklou.git

HTMLForm: fix double escaping of checkbox labels in vform

mLabel has already been escaped if required. It isn't run through htmlspecialchars()
in other display formats, so doesn't need to be done in vform.

Change-Id: I0b0feec408687cdadf01da5f2078980015538bb7
---

diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/HTMLCheckField.php
old mode 100644
new mode 100755
index c7ec014772..a0dd37054d
--- a/includes/htmlform/HTMLCheckField.php
+++ b/includes/htmlform/HTMLCheckField.php
@@ -24,8 +24,7 @@ class HTMLCheckField extends HTMLFormField {
 				array(
 					'class' => 'mw-ui-checkbox-label'
 				),
-				Xml::check( $this->mName, $value, $attr ) . // Html:rawElement doesn't escape contents.
-				htmlspecialchars( $this->mLabel ) );
+				Xml::check( $this->mName, $value, $attr ) . $this->mLabel );
 		} else {
 			return Xml::check( $this->mName, $value, $attr )
 			. '&#160;'