jenkins-bot has submitted this change and it was merged.
Change subject: Fixing double escaping of searchbox placeholders.
......................................................................
Fixing double escaping of searchbox placeholders.
Bug: 50618
Change-Id: I3ca7496ad9613817f22c6b609d8773a5575c0d98
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMobile.php
M includes/skins/SkinMobileAlpha.php
M includes/skins/SkinMobileBeta.php
4 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 9403b7d..d6a4e49 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -53,7 +53,9 @@
'id' => 'searchInput',
'class' => 'search',
'autocomplete' => 'off',
- 'placeholder' => wfMessage(
'mobile-frontend-placeholder' )->escaped(),
+ // The placeholder gets fed to HTML::element later
which escapes all
+ // attribute values, so no need to escape the string
here.
+ 'placeholder' => wfMessage(
'mobile-frontend-placeholder' )->text(),
);
$tpl->set( 'searchBox', $searchBox );
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 77ae426..98c5adb 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -92,7 +92,7 @@
}
protected function getSearchPlaceHolderText() {
- return wfMessage( 'mobile-frontend-placeholder' )->escaped();
+ return wfMessage( 'mobile-frontend-placeholder' )->text();
}
public function prepareData( BaseTemplate $tpl ) {
diff --git a/includes/skins/SkinMobileAlpha.php
b/includes/skins/SkinMobileAlpha.php
index 7d05308..d51fde9 100644
--- a/includes/skins/SkinMobileAlpha.php
+++ b/includes/skins/SkinMobileAlpha.php
@@ -5,7 +5,7 @@
protected $mode = 'alpha';
protected function getSearchPlaceHolderText() {
- return wfMessage( 'mobile-frontend-placeholder-alpha'
)->escaped();
+ return wfMessage( 'mobile-frontend-placeholder-alpha' )->text();
}
public function getDefaultModules() {
diff --git a/includes/skins/SkinMobileBeta.php
b/includes/skins/SkinMobileBeta.php
index 64d9a1b..754abed 100644
--- a/includes/skins/SkinMobileBeta.php
+++ b/includes/skins/SkinMobileBeta.php
@@ -5,7 +5,7 @@
protected $mode = 'beta';
protected function getSearchPlaceHolderText() {
- return wfMessage( 'mobile-frontend-placeholder-beta'
)->escaped();
+ return wfMessage( 'mobile-frontend-placeholder-beta' )->text();
}
public function initPage( OutputPage $out ) {
--
To view, visit https://gerrit.wikimedia.org/r/71953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ca7496ad9613817f22c6b609d8773a5575c0d98
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
