From fea9c9f1296eb3398089a8debaf13722e44ca1aa Mon Sep 17 00:00:00 2001
From: Jimmy Collins <collinj@users.mediawiki.org>
Date: Sat, 22 Jul 2006 20:22:50 +0000
Subject: [PATCH] * (bug 5456) Separate MediaWiki:Search into messages for both
 noun and   verb, introduced MediaWiki:Searchbutton

---
 RELEASE-NOTES              | 2 ++
 includes/Skin.php          | 2 +-
 includes/SpecialSearch.php | 2 +-
 languages/Messages.php     | 1 +
 skins/MonoBook.php         | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e1ec73a760..15bcc0e155 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -71,6 +71,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fix regression which allowed some blocked users to create additional accounts
 * (bug 6657) Fix Hungarian linktrail
 * (bug 6751) Fix preview of blanked section with edit on first preview option
+* (bug 5456) Separate MediaWiki:Search into messages for both noun and verb,
+  introduced 'MediaWiki:Searchbutton'
 
 
 == Languages updated ==
diff --git a/includes/Skin.php b/includes/Skin.php
index c0a75a67b8..b56ec96ac6 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -803,7 +803,7 @@ END;
 		  . '<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" name="fulltext" value="' . wfMsg ('search') . "\" />\n</form>";
+		  . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
 
 		return $s;
 	}
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index c4669854d6..4667bd68b6 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -151,7 +151,7 @@ class SpecialSearch {
 				wfMsg( 'googlesearch',
 					htmlspecialchars( $term ),
 					htmlspecialchars( $wgInputEncoding ),
-					htmlspecialchars( wfMsg( 'search' ) )
+					htmlspecialchars( wfMsg( 'searchbutton' ) )
 				)
 			);
 			wfProfileOut( $fname );
diff --git a/languages/Messages.php b/languages/Messages.php
index 2ca84c6379..064752bca3 100644
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -172,6 +172,7 @@ parent class in order maintain consistency across languages.
 'tagline'      	=> 'From {{SITENAME}}',
 'help'			=> 'Help',
 'search'		=> 'Search',
+'searchbutton'		=> '{{int:search}}111', # see bug 5456
 'go'		=> 'Go',
 'history'		=> 'Page history',
 'history_short' => 'History',
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index c80700d005..1de2d6b12c 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -165,7 +165,7 @@ class MonoBookTemplate extends QuickTemplate {
 					if( isset( $this->data['search'] ) ) {
 						?> value="<?php $this->text('search') ?>"<?php } ?> />
 				<input type='submit' name="go" class="searchButton" id="searchGoButton"	value="<?php $this->msg('go') ?>" />&nbsp;
-				<input type='submit' name="fulltext" class="searchButton" value="<?php $this->msg('search') ?>" />
+				<input type='submit' name="fulltext" class="searchButton" value="<?php $this->msg('searchbutton') ?>" />
 			</div></form>
 		</div>
 	</div>
-- 
2.20.1