Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

[lhc/web/wiklou.git] / includes / SpecialSearch.php

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index a8aadfa..057b487 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -97,20 +97,6 @@ class SpecialSearch {
                        return;
                }
 
-               # if language supports variants, search in all variants
-               if(sizeof($wgContLang->getVariants())>1){
-                       $allTermVariants = $wgContLang->convertLinkToAllVariants($term);
-
-                       foreach($allTermVariants as $termVariant){
-                               $t = SearchEngine::getNearMatch( $termVariant );
-                               if( !is_null( $t ) ) {
-                                       $wgOut->redirect( $t->getFullURL() );
-                                       wfProfileOut( $fname );
-                                       return;
-                               }
-                       }
-               }
-
                # No match, generate an edit URL
                $t = Title::newFromText( $term );
                if( is_null( $t ) ) {
@@ -166,7 +152,7 @@ class SpecialSearch {
                                wfMsg( 'googlesearch',
                                        htmlspecialchars( $term ),
                                        htmlspecialchars( $wgInputEncoding ),
-                                       htmlspecialchars( wfMsg( 'search' ) )
+                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
                                )
                        );
                        wfProfileOut( $fname );