From 056c31a27a0612bea141abacc2a9f7895bf647f5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 23 Sep 2003 16:23:09 +0000
Subject: [PATCH] Google charset fix

---
 includes/SearchEngine.php | 4 ++--
 languages/Language.php    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 314cf3fac5..6965eb7842 100644
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -142,6 +142,7 @@ class SearchEngine {
 	function showResults()
 	{
 		global $wgUser, $wgTitle, $wgOut, $wgLang, $wgDisableTextSearch;
+		global $wgInputEncoding;
 		$fname = "SearchEngine::showResults";
 
 		$search		= $_REQUEST['search'];
@@ -228,8 +229,7 @@ class SearchEngine {
 		}
 
 		if ( $wgDisableTextSearch ) {
-			$wgOut->addHTML( str_replace( "$1",
-			  htmlspecialchars( $search ), wfMsg( "searchdisabled" ) ) );
+			$wgOut->addHTML( wfMsg( "searchdisabled", $search, $wgInputEncoding ) );
 		} else {
 			if ( 0 == wfNumRows( $res2 ) ) {
 				$wgOut->addHTML( "<h2>" . wfMsg( "notextmatches" ) .
diff --git a/languages/Language.php b/languages/Language.php
index 8998aefe1c..05e78eacf5 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -699,6 +699,8 @@ border=\"0\" ALT=\"Google\"></A>
 <INPUT type=submit name=btnG VALUE=\"Google Search\">
 <font size=-1>
 <input type=hidden name=domains value=\"{$wgServer}\"><br><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{$wgServer}\" checked> {$wgServer} <br>
+<input type='hidden' name='ie' value='$2'>
+<input type='hidden' name='oe' value='$2'>
 </font>
 </td></tr></TABLE>
 </FORM>
-- 
2.20.1