jenkins-bot has submitted this change and it was merged.
Change subject: OOUIHTMLForm: Wrap help text in OOUI\HtmlSnippet
......................................................................
OOUIHTMLForm: Wrap help text in OOUI\HtmlSnippet
HTMLFormField::getHelpText() returns HTML and should not be escaped.
Depends upon 1dbef2766f23 in OOUI.
Bug: T104422
Change-Id: I33c8ebb448e345db7bf8b8ad540336b5b9d6aea1
---
M includes/htmlform/HTMLFormField.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLFormField.php
b/includes/htmlform/HTMLFormField.php
index e19273b..3e30d79 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -585,7 +585,7 @@
'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 @@
/**
* Determine the help text to display
* @since 1.20
- * @return string
+ * @return string HTML
*/
public function getHelpText() {
$helptext = null;
--
To view, visit https://gerrit.wikimedia.org/r/224299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33c8ebb448e345db7bf8b8ad540336b5b9d6aea1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
