Another follow-up for 50207: show form header for empty searches as well

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 63bbbcc..f7418b3 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -201,6 +201,7 @@ class SpecialSearch {
                $filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':';
                if( '' === trim( $term ) || $filePrefix === trim( $term ) ) {
                        $wgOut->addHTML( $this->searchAdvanced ? $this->powerSearchFocus() : $this->searchFocus() );
+                       $wgOut->addHTML( $this->formHeader($term, 0, 0));
                        // Empty query -- straight view of search form
                        wfProfileOut( __METHOD__ );
                        return;

diff --git a/skins/common/search.js b/skins/common/search.js
index 773aba6..aad9920 100644 (file)
--- a/skins/common/search.js
+++ b/skins/common/search.js
@@ -11,9 +11,12 @@ function mwSearchHeaderClick(obj){
        var searchterm = searchbox.value;
        var parts = obj.href.split("search=");
        var lastpart = '';
-       if( parts[1].indexOf('&') >= 0 )
+       var prefix = "search=";
+       if( parts.length > 1 && parts[1].indexOf('&') >= 0 )
                lastpart = parts[1].substring( parts[1].indexOf('&') )
-       obj.href = parts[0] + "search=" + encodeURIComponent(searchterm) + lastpart;
+       else 
+               prefix = "&search=";
+       obj.href = parts[0] + prefix + encodeURIComponent(searchterm) + lastpart;
 }
 
 function mwToggleSearchCheckboxes( btn ) {