From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 13 Mar 2008 21:34:53 +0000 (+0000)
Subject: Allow wikitext for 'powersearchtext'
X-Git-Tag: 1.31.0-rc.0~49129
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=75d765d32a04fef3e126daf0622528441fba7268;p=lhc%2Fweb%2Fwiklou.git

Allow wikitext for 'powersearchtext'
---

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index b15b962fcc..e1b9199f7b 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -440,23 +440,17 @@ class SpecialSearch {
 			if( '' == $name ) {
 				$name = wfMsg( 'blanknamespace' );
 			}
-			$encName = htmlspecialchars( $name );
-			$namespaces .= " <label><input type='checkbox' value=\"1\" name=\"" .
-			  "ns{$ns}\"{$checked} />{$encName}</label>\n";
+			$namespaces .= Xml::checkLabel( $name, "ns{$ns}", $name, $checked ) . "\n"; 
 		}
 
 		$checked = $this->searchRedirects
 			? ' checked="checked"'
 			: '';
-		$redirect = "<input type='checkbox' value='1' name=\"redirs\"{$checked} />\n";
+		$redirect =  Xml::check( 'redirs', $checked ) . "\n";
+		$searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
+		$searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'searchx' ) );
 
-		$searchField = '<input type="text" id="powerSearchText" name="search" value="' .
-			htmlspecialchars( $term ) ."\" size=\"50\" />\n";
-
-		$searchButton = '<input type="submit" name="searchx" value="' .
-		  htmlspecialchars( wfMsg('powersearch') ) . "\" />\n";
-
-		$ret = wfMsg( 'powersearchtext',
+		$ret = wfMsgExt( 'powersearchtext', array( 'parse', 'replaceafter' ),
 			$namespaces, $redirect, $searchField,
 			'', '', '', '', '', # Dummy placeholders
 			$searchButton );
@@ -466,7 +460,7 @@ class SpecialSearch {
 		return "<br /><br />\n<form id=\"powersearch\" method=\"get\" " .
 		  "action=\"$action\">\n{$ret}\n</form>\n";
 	}
-	
+
 	function powerSearchFocus() {
 		return "<script type='text/javascript'>" .
 			"document.getElementById('powerSearchText').focus();" .