Use getSearchLink() instead of escapeSearchLink() in SkinTemplate for
'searchaction'. The skins do the HTML escaping of 'searchaction'
themself.
Depends-On: I6493cec99e22f2c56a081f1fc4d96ebc584915de
Depends-On: I268b412d84ba73d6fdae633a343c45865cb8b07b
Change-Id: I32f51a048b7a95e3697eaf18f2bd2f9a3b96065f
* The use of the $terms param in the ShowSearchHit and ShowSearchHitTitle
hooks is highly discouraged as it's only populated by SearchDatabase search
engines.
* The use of the $terms param in the ShowSearchHit and ShowSearchHitTitle
hooks is highly discouraged as it's only populated by SearchDatabase search
engines.
+* Skin::escapeSearchLink() is deprecated. Use Skin::getSearchLink() or the skin
+ template option 'searchaction' instead.
=== Other changes in 1.34 ===
* …
=== Other changes in 1.34 ===
* …
+ * @deprecated since 1.34, use getSearchLink() instead.
* @return string
*/
function escapeSearchLink() {
* @return string
*/
function escapeSearchLink() {
+ wfDeprecated( __METHOD__, '1.34' );
return htmlspecialchars( $this->getSearchLink() );
}
return htmlspecialchars( $this->getSearchLink() );
}
$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
$tpl->set( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
$tpl->set( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
- $tpl->set( 'searchaction', $this->escapeSearchLink() );
+ $tpl->set( 'searchaction', $this->getSearchLink() );
$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
$tpl->set( 'stylepath', $wgStylePath );
$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
$tpl->set( 'stylepath', $wgStylePath );