***************
*** 301,312 ****
  
  		$search = $wgRequest->getText( 'search' );
  		$action = $this->escapeSearchLink();
- 		$s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"$action\">";
  		if ( "" != $label ) { $s .= "{$label}: "; }
  
- 		$s .= "<input type='text' id=\"searchtext\" name=\"searchtext\" size=\"14\" value=\""
  		  . htmlspecialchars(substr($search,0,256)) . "\" />"
- 		  . "<br /><input type='submit' id=\"go\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' id=\"fulltext\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
  
  		return $s;
  	}
--- 301,312 ----
  
  		$search = $wgRequest->getText( 'search' );
  		$action = $this->escapeSearchLink();
+ 		$s = "<form id=\"searchform\" method=\"get\" class=\"inline\" action=\"$action\">";
  		if ( "" != $label ) { $s .= "{$label}: "; }
  
+ 		$s .= "<input type='text' id=\"searchInput\" name=\"search\" size=\"14\" value=\""
  		  . htmlspecialchars(substr($search,0,256)) . "\" />"
+ 		  . "<br /><input type='submit' id=\"searchGoButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' id=\"mw-searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
  
  		return $s;
  	}
