* (bug 1953) Search form now honors namespace selections more reliably

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 114326f..00b7c92 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -113,6 +113,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Disallow deletion of big pages by means of moving a page to its title and using the
   "delete and move" option.
 * (bug 13466) White space differences not shown in diffs
+* (bug 1953) Search form now honors namespace selections more reliably
+
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 1d6e2a6..885a81a 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -58,9 +58,8 @@ class SpecialSearch {
        function SpecialSearch( &$request, &$user ) {
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
 
-               if( $request->getCheck( 'searchx' ) ) {
-                       $this->namespaces = $this->powerSearch( $request );
-               } else {
+               $this->namespaces = $this->powerSearch( $request );
+               if( empty( $this->namespaces ) ) {
                        $this->namespaces = $this->userNamespaces( $user );
                }
 
@@ -287,7 +286,6 @@ class SpecialSearch {
                        $opt['ns' . $n] = 1;
                }
                $opt['redirs'] = $this->searchRedirects ? 1 : 0;
-               $opt['searchx'] = 1;
                return $opt;
        }
        
@@ -479,7 +477,7 @@ class SpecialSearch {
 
                $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1' ) );
                $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
-               $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'searchx' ) ) . "\n";
+               $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n";
 
                $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
                        Xml::openElement( 'fieldset' ) .
@@ -511,6 +509,11 @@ class SpecialSearch {
                ));
                $out .= Xml::hidden( 'title', 'Special:Search' );
                $out .= Xml::input( 'search', 50, $term ) . ' ';
+               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+                       if( in_array( $ns, $this->namespaces ) ) {
+                               $out .= Xml::hidden( "ns{$ns}", '1' );
+                       }
+               }
                $out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
                $out .= Xml::closeElement( 'form' );