From ad068b0f9f03a8a8d8f9b1d3fb979f7377b94aea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20Stojni=C4=87?= Date: Sun, 31 May 2009 16:58:01 +0000 Subject: [PATCH] Another follow-up for 50207: show form header for empty searches as well --- includes/specials/SpecialSearch.php | 1 + skins/common/search.js | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 63bbbcc8f3..f7418b3eb7 100644 --- 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 773aba6c30..aad9920aee 100644 --- 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 ) { -- 2.20.1