Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71953
Change subject: Fixing double escaping of searchbox placeholder.
......................................................................
Fixing double escaping of searchbox placeholder.
Also removing some redundant code.
Bug: 50618
Change-Id: I3ca7496ad9613817f22c6b609d8773a5575c0d98
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMobile.php
2 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/53/71953/1
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..8533e8c 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -91,14 +91,9 @@
return $className . implode( ' ', array_keys(
$this->pageClassNames ) );
}
- protected function getSearchPlaceHolderText() {
- return wfMessage( 'mobile-frontend-placeholder' )->escaped();
- }
-
public function prepareData( BaseTemplate $tpl ) {
parent::prepareData( $tpl );
$search = $tpl->data['searchBox'];
- $search['placeholder'] = $this->getSearchPlaceHolderText();
$tpl->set( 'searchBox', $search );
}
--
To view, visit https://gerrit.wikimedia.org/r/71953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ca7496ad9613817f22c6b609d8773a5575c0d98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
