FIX #655 : when user enter an empty search query:

* show an empty search form
* hide subtitle

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e9ca3b0..2cd3631 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -560,6 +560,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Add serialized version number to image metadata cache records
 * (bug 2780) Fix thumbnail generation with GD for new image schema
 * (bug 2791) Slovene numeric format
+* (bug 655) Provide empty search form when searching for nothing
 
 === Caveats ===
 

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 0af2925..20948b9 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -134,9 +134,8 @@ class SpecialSearch {
                
                #if ( !$this->parseQuery() ) {
                if( '' === trim( $term ) ) {
-                       $wgOut->addWikiText(
-                               '==' . wfMsg( 'badquery' ) . "==\n" .
-                               wfMsg( 'badquerytext' ) );
+                       $wgOut->setSubtitle( '' );
+                       $wgOut->addHTML( $this->powerSearchBox( $term ) );
                        wfProfileOut( $fname );
                        return;
                }