Cleanup for r43376:

* Use a more precious fieldset legend
* Remove two unused message names from messages.inc

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index b906dd9..77a290c 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -646,7 +646,7 @@ class SpecialSearch {
                $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
 
                return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
-                       Xml::element( 'legend', null, wfMsg('searchresults') ) .
+                       Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
                        $this->formHeader($term) . $out . 
                        Xml::closeElement( 'fieldset' );
        }
@@ -792,7 +792,7 @@ class SpecialSearch {
                $out .= Xml::closeElement( 'form' );
                $out .= wfMsgExt( 'searchmenu-prefix', array('parseinline'), $term );
                return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
-                       Xml::element( 'legend', null, wfMsg('searchresults') ) .
+                       Xml::element( 'legend', null, wfMsg('searchmenu-legend') ) .
                        $this->formHeader($term) . $out .
                        Xml::closeElement( 'fieldset' );
        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9548845..4835751 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1426,6 +1426,7 @@ Note that using the navigation links will reset this column.',
 'prevn'                            => 'previous $1',
 'nextn'                            => 'next $1',
 'viewprevnext'                     => 'View ($1) ($2) ($3)',
+'searchmenu-legend'                => 'Search options',
 'searchmenu-exists'                => "'''There is page named \"[[\$1]]\" on this wiki'''",
 'searchmenu-new'                   => "'''[[\$1|Create]] the page \"[[\$1]]\" on this wiki!'''",
 'searchhelp-url'                   => 'Project:Searching',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 3e48e09..3517924 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -766,13 +766,12 @@ $wgMessageStructure = array(
                'prevn',
                'nextn',
                'viewprevnext',
+               'searchmenu-legend',
                'searchmenu-exists',
                'searchmenu-new',
                'searchhelp-url',
                'searchmenu-prefix',
                'searchmenu-help',
-               'searchmenu-badtitle',
-               'searchmenu',
                'searchprofile-articles',
                'searchprofile-articles-and-proj',
                'searchprofile-project',