From: Derk-Jan Hartman <hartman@videolan.org>
Date: Sun, 21 Apr 2013 17:27:46 +0000 (+0200)
Subject: CologneBlue: Use search input and button generators from SkinTemplate
X-Git-Tag: 1.31.0-rc.0~19346^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=2beed87111899f5a50e5764b62592bfc59d80985;p=lhc%2Fweb%2Fwiklou.git

CologneBlue: Use search input and button generators from SkinTemplate

This also makes sure that the search inputs receive their placeholder,
which fixes bug 47475.

Bug: 47475

Change-Id: Ie1215078edb38f98ec57d2a3ec46b1d0ace0bc30
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index d766b64de5..5ae8843413 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -541,13 +541,12 @@ class CologneBlueTemplate extends BaseTemplate {
 			$s .= wfMessage( 'qbfind' )->text() . ": ";
 		}
 
-		$s .= "<input type='text' class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\""
-			. htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />"
-			. ( $which == 'footer' ? " " : "<br />" )
-			. "<input type='submit' class=\"searchButton\" name=\"go\" value=\"" . wfMessage( 'searcharticle' )->escaped() . "\" />";
+		$s .= $this->makeSearchInput( array( 'class' => 'mw-searchInput', 'type' => 'text', 'size' => '14' ) );
+		$s .= ( $which == 'footer' ? " " : "<br />" );
+		$s .= $this->makeSearchButton( 'go', array( 'class' => 'searchButton' ) );
 
 		if ( $wgUseTwoButtonsSearchForm ) {
-			$s .= " <input type='submit' class=\"searchButton\" name=\"fulltext\" value=\"" . wfMessage( 'searchbutton' )->escaped() . "\" />\n";
+			$s .= $this->makeSearchButton( 'fulltext', array( 'class' => 'searchButton' ) );
 		} else {
 			$s .= '<div><a href="' . $action . '" rel="search">' . wfMessage( 'powersearch-legend' )->escaped() . "</a></div>\n";
 		}