From 23d21c4ae758464614121c56b12d36a9f4daea55 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 3 Sep 2018 22:58:45 -0700 Subject: [PATCH] Set explicit output formats to prevent over escaping of messages Not calling an explicit output format defaults to ->escaped(), which often leads to double escaping. Spotted by the phan-taint-check-plugin. Change-Id: Ie527768bea670808e63cfc8cbff64015ae29d4a3 --- includes/skins/SkinMinerva.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index d3de7dc..4be0880 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -821,7 +821,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin { // This is shown when js is disabled. js enhancement made due to caching $tagline = $this->msg( 'mobile-frontend-user-page-member-since', $this->getLanguage()->userDate( new MWTimestamp( $fromDateTs ), $this->getUser() ), - $pageUser ); + $pageUser )->text(); // Define html attributes for usage with js enhancement (unix timestamp, gender) $attrs = [ 'id' => 'tagline-userpage', @@ -929,11 +929,11 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin { $tpl->set( 'menuButton', Html::element( 'a', [ - 'title' => $this->msg( 'mobile-frontend-main-menu-button-tooltip' ), + 'title' => $this->msg( 'mobile-frontend-main-menu-button-tooltip' )->text(), 'href' => $url, 'class' => MinervaUI::iconClass( 'mainmenu', 'element', 'main-menu-button' ), 'id' => 'mw-mf-main-menu-button', - ], $this->msg( 'mobile-frontend-main-menu-button-tooltip' ) ) + ], $this->msg( 'mobile-frontend-main-menu-button-tooltip' )->text() ) ); }