Merge "OOUIHTMLForm: Wrap help text in OOUI\HtmlSnippet"

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index e19273b..3e30d79 100644 (file)
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -585,7 +585,7 @@ abstract class HTMLFormField {
                        'classes' => array( "mw-htmlform-field-$fieldType", $this->mClass, $errorClass ),
                        'align' => $this->getLabelAlignOOUI(),
                        'label' => $this->getLabel(),
-                       'help' => $this->getHelpText(),
+                       'help' => new OOUI\HtmlSnippet( $this->getHelpText() ),
                        'infusable' => $infusable,
                ) );
 
@@ -729,7 +729,7 @@ abstract class HTMLFormField {
        /**
         * Determine the help text to display
         * @since 1.20
-        * @return string
+        * @return string HTML
         */
        public function getHelpText() {
                $helptext = null;