From: TheDJ <hartman.wiki@gmail.com>
Date: Sun, 21 Apr 2013 16:59:00 +0000 (+0000)
Subject: Merge "Fixed Bug 40464 Placeholder attribute of searchInput element"
X-Git-Tag: 1.31.0-rc.0~19923
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=f7c5ef1307141bdd9bdcc96496fd61ab269e65be;hp=ef2f507d23eb227194d5690518a2c3255dfcdca3;p=lhc%2Fweb%2Fwiklou.git

Merge "Fixed Bug 40464 Placeholder attribute of searchInput element"
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 83ae4c6900..17c7808ad1 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1819,6 +1819,7 @@ abstract class BaseTemplate extends QuickTemplate {
 		$realAttrs = array(
 			'type' => 'search',
 			'name' => 'search',
+			'placeholder' => wfMessage( 'searchsuggest-search' )->text(),
 			'value' => isset( $this->data['search'] ) ? $this->data['search'] : '',
 		);
 		$realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs );
diff --git a/resources/mediawiki/mediawiki.searchSuggest.js b/resources/mediawiki/mediawiki.searchSuggest.js
index 2bc7cea9eb..516c58f8be 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -196,11 +196,6 @@
 			return;
 		}
 
-		// Placeholder text for search box
-		$searchInput
-			.attr( 'placeholder', mw.msg( 'searchsuggest-search' ) )
-			.placeholder();
-
 		// Special suggestions functionality for skin-provided search box
 		$searchInput.suggestions( {
 			result: {