From: Mr. E23 <e23@users.mediawiki.org>
Date: Sat, 14 Feb 2004 13:00:22 +0000 (+0000)
Subject: Fixed bug causing different search actions on submit-by-return in IE and moz. Changed... 
X-Git-Tag: 1.3.0beta1~988
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=0aef0fa99e0cf450e9510a519b6f9b98d023562f;p=lhc%2Fweb%2Fwiklou.git

Fixed bug causing different search actions on submit-by-return in IE and moz. Changed default search action to 'Go'
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 598181ec48..f817d61876 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -584,7 +584,7 @@ class Skin {
 		  . "<input type=text name=\"search\" size=19 value=\""
 		  . htmlspecialchars(substr($search,0,256)) . "\">\n"
 		  . "<input type=submit name=\"go\" value=\"" . wfMsg ("go") . "\">&nbsp;"
-		  . "<input type=submit value=\"" . wfMsg ("search") . "\"></form>";
+		  . "<input type=submit name=\"fulltext\" value=\"" . wfMsg ("search") . "\"></form>";
 
 		return $s;
 	}
diff --git a/wiki.phtml b/wiki.phtml
index 4093459b09..3fcf006245 100644
--- a/wiki.phtml
+++ b/wiki.phtml
@@ -40,10 +40,10 @@ if ( "" == $title && "delete" != $action ) {
 wfProfileOut( "main-misc-setup" );
 
 if ( "" != $search ) {
-	if($go) {
-		wfGo( $search );
-	} else {
+	if( isset($_REQUEST['fulltext']) ) {
 		wfSearch( $search );
+	} else {
+		wfGo( $search );
 	}
 } else if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
 	$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );