Google charset fix

diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 314cf3f..6965eb7 100644 (file)
--- 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 8998aef..05e78ea 100644 (file)
--- 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>