Merge "Workaround image magick issue with greyscale xcf files"

[lhc/web/wiklou.git] / includes / htmlform / HTMLCheckField.php

diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/HTMLCheckField.php
index 7baab66..a0dd370 100644 (file)
--- 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 )
                        . ' '
@@ -36,7 +35,7 @@ class HTMLCheckField extends HTMLFormField {
        /**
         * For a checkbox, the label goes on the right hand side, and is
         * added in getInputHTML(), rather than HTMLFormField::getRow()
-        * @return String
+        * @return string
         */
        function getLabel() {
                return ' ';
@@ -44,15 +43,16 @@ class HTMLCheckField extends HTMLFormField {
 
        /**
         * checkboxes don't need a label.
+        * @return bool
         */
        protected function needsLabel() {
                return false;
        }
 
        /**
-        * @param $request WebRequest
+        * @param WebRequest $request
         *
-        * @return String
+        * @return string
         */
        function loadDataFromRequest( $request ) {
                $invert = false;