* (bug 5456) Separate MediaWiki:Search into messages for both noun and

  verb, introduced MediaWiki:Searchbutton

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e1ec73a..15bcc0e 100644 (file)
--- 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 c0a75a6..b56ec96 100644 (file)
--- 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 c466985..4667bd6 100644 (file)
--- 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 2ca84c6..064752b 100644 (file)
--- 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 c80700d..1de2d6b 100644 (file)
--- 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>