(bug 13407) MediaWiki:Powersearch is used in two places

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6ad1cca..d4511bf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -96,6 +96,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7251) Sidebars generated by MediaWiki:Sidebar now have the class
   'generated-sidebar'.
 * (bug 13265) Media handler is missing 'image/x-bmp'
+* (bug 13407) MediaWiki:Powersearch is used in two places
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index e20d838..b531caa 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -483,7 +483,7 @@ class SpecialSearch {
 
                $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
                        Xml::openElement( 'fieldset' ) .
-                       Xml::element( 'legend', array( ), wfMsg( 'powersearch' ) ) .
+                       Xml::element( 'legend', array( ), wfMsg( 'powersearch-legend' ) ) .
                        Xml::hidden( 'title', 'Special:Search' ) .
                        wfMsgExt( 'powersearchtext', array( 'parse', 'replaceafter' ),
                                $namespaces, $redirect, $searchField,

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f44355c..b651546 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1226,6 +1226,7 @@ Make sure that this change will maintain historical page continuity.
 'showingresultsnum'     => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.",
 'nonefound'             => "'''Note''': Unsuccessful searches are often caused by searching for common words like \"have\" and \"from\", which are not indexed, or by specifying more than one search term (only pages containing all of the search terms will appear in the result).",
 'powersearch'           => 'Advanced search',
+'powersearch-legend'    => 'Advanced search',
 'powersearchtext'       => 'Search in namespaces:<br />$1<br />$2 List redirects<br />Search for $3 $9',
 'searchdisabled'        => '{{SITENAME}} search is disabled. You can search via Google in the meantime. Note that their indexes of {{SITENAME}} content may be out of date.',
 'googlesearch'          => '<form method="get" action="http://www.google.com/search" id="googlesearch">

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 757f143..549a99c 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -676,6 +676,7 @@ $wgMessageStructure = array(
                'showingresultsnum',
                'nonefound',
                'powersearch',
+               'powersearch-legend',
                'powersearchtext',
                'searchdisabled',
                'googlesearch',