jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393438 )
Change subject: Let Html::element do the HTML escaping
......................................................................
Let Html::element do the HTML escaping
Change-Id: I83a738babed5cb0a68651e4d67753bce0b72c796
---
M TimelessTemplate.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index 21a09be..318839a 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -229,8 +229,8 @@
'div',
[ 'id' => Sanitizer::escapeId( $id ), 'class' =>
'sidebar-chunk' ],
Html::rawElement( 'h2', [],
- Html::rawElement( 'span', [],
- $this->getMsg( $headerMessage
)->escaped()
+ Html::element( 'span', [],
+ $this->getMsg( $headerMessage )->text()
) .
Html::element( 'div', [ 'class' => 'pokey' ] )
) .
@@ -462,20 +462,20 @@
// Make sure it fits first (numbers slightly made up,
may need adjusting)
$fit = empty( $extraTools ) ? 13 : 9;
if ( mb_strlen( $userName ) < $fit ) {
- $dropdownHeader = htmlspecialchars( $userName,
ENT_QUOTES );
+ $dropdownHeader = $userName;
} else {
- $dropdownHeader = wfMessage(
'timeless-loggedin' )->escaped();
+ $dropdownHeader = wfMessage(
'timeless-loggedin' )->text();
}
$headerMsg = [ 'timeless-loggedinas', $user->getName()
];
} else {
- $dropdownHeader = wfMessage( 'timeless-anonymous'
)->escaped();
+ $dropdownHeader = wfMessage( 'timeless-anonymous'
)->text();
$headerMsg = 'timeless-notloggedin';
}
$html .= Html::openElement( 'div', [ 'id' => 'user-tools' ] );
$html .= Html::rawElement( 'div', [ 'id' => 'personal' ],
Html::rawElement( 'h2', [],
- Html::rawElement( 'span', [], $dropdownHeader )
.
+ Html::element( 'span', [], $dropdownHeader ) .
Html::element( 'div', [ 'class' => 'pokey' ] )
) .
Html::rawElement( 'div', [ 'id' => 'personal-inner',
'class' => 'dropdown' ],
--
To view, visit https://gerrit.wikimedia.org/r/393438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83a738babed5cb0a68651e4d67753bce0b72c796
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Fomafix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
