#1120 Keyword search: it shows everything when "Searchable fields for keyword search" is empty

inc/classes/BxDolSearch.php

@@ -692,12 +692,17 @@ class BxDolSearchResult implements iBxDolReplaceable
     {
         // keyword
         $sKeyword = bx_process_input(isset($this->_aCustomSearchCondition['keyword']) ? $this->_aCustomSearchCondition['keyword'] : bx_get('keyword'));
-        if ($sKeyword !== false)
+        if ($sKeyword) {
             $this->aCurrent['restriction']['keyword'] = array(
                 'value' => $sKeyword,
                 'field' => '',
                 'operator' => 'against'
             );
+        }
+        else {
+            $this->aCurrent['paginate']['num'] = 0;
+            return;
+        }
 
         // owner
         if (isset($_GET['ownerName'])) {

searchKeyword.php

@@ -36,7 +36,7 @@ if (bx_get('keyword') !== false) {
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader (_t("_Search"));
-$oTemplate->setPageContent ('page_main_code', $oSearch->getForm() . $oSearch->getResultsContainer($sCode));
+$oTemplate->setPageContent ('page_main_code', $oSearch->getForm() . ($sCode ? $oSearch->getResultsContainer($sCode) : ''));
 $oTemplate->getPageCode();
 
 /** @} */