(bug 14063) Power search form missing <label> for redirects check

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1934dcf..f009b67 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -270,6 +270,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Message name filter on Special:Allmessages now case-insensitive
 * (bug 13943) Fix image redirect behaviour on image pages
 * (bug 14093) Do 'sysop' => 'protect' magic in Title::isValidMoveOperation
+* (bug 14063) Power search form missing <label> for redirects check
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index ea1532b..e78fcd9 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -592,7 +592,8 @@ class SpecialSearch {
                                        Xml::closeElement( 'span' ) . "\n";
                }
 
-               $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1' ) );
+               $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
+               $redirectLabel = Xml::label( wfMsg( 'powersearchtext-redir' ), 'redirs' );
                $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
                $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n";
 
@@ -600,10 +601,11 @@ class SpecialSearch {
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', array( ), wfMsg( 'powersearch-legend' ) ) .
                        Xml::hidden( 'title', 'Special:Search' ) .
-                       wfMsgExt( 'powersearchtext', array( 'parse', 'replaceafter' ),
-                               $namespaces, $redirect, $searchField,
-                               '', '', '', '', '', # Dummy placeholders
-                               $searchButton ) .
+                       wfMsgExt( 'powersearchtext-ns', array( 'parse', 'replaceafter' ), $namespaces) .
+                       Xml::openElement( 'p' ) .
+                       $redirect . " " . $redirectLabel .
+                       Xml::closeElement( 'p') .
+                       wfMsgExt( 'powersearchtext-field', array( 'parse', 'replaceafter' ), $searchField, $searchButton) .
                        Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' );
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 3b0f6f8..adc5ff5 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1318,7 +1318,9 @@ You can [[:\$1|create this page]].",
 'nonefound'                 => "'''Note''': Only some namespaces are searched by default. Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.",
 'powersearch'               => 'Advanced search',
 'powersearch-legend'        => 'Advanced search',
-'powersearchtext'           => 'Search in namespaces:<br />$1<br />$2 List redirects<br />Search for $3 $9',
+'powersearchtext-ns'        => 'Search in namespaces:<br />$1<br />',
+'powersearchtext-redir'     => 'List redirects',
+'powersearchtext-field'     => 'Search for $1 $2',
 'search-external'           => 'External search',
 'searchdisabled'            => '{{SITENAME}} search is disabled.
 You can search via Google in the meantime.