Hide recent searches if there is no search plugin activated. Refs zik…

…ula#102
planetenkiller · Dec 2, 2011 · 37fa13f · 37fa13f
1 parent 004ce3e
commit 37fa13f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/system/Search/lib/Search/Api/User.php b/src/system/Search/lib/Search/Api/User.php
@@ -432,10 +432,11 @@ public static function construct_where($args, $fields, $mlfield = null)
     public function getlinks($args)
     {
         $links = array();
+        $search_modules = ModUtil::apiFunc('Search', 'user', 'getallplugins');
 
         if (SecurityUtil::checkPermission('Search::', '::', ACCESS_READ)) {
             $links[] = array('url' => ModUtil::url('Search', 'user', 'main', array()), 'text' => $this->__('New search'), 'class' => 'z-icon-es-search');
-            if (UserUtil::isLoggedIn()) {
+            if ((count($search_modules) > 0) && UserUtil::isLoggedIn()) {
                 $links[] = array('url' => ModUtil::url('Search', 'user', 'recent', array()), 'text' => $this->__('Recent searches list'), 'class' => 'z-icon-es-view');
             }
         }

diff --git a/src/system/Search/templates/search_user_form.tpl b/src/system/Search/templates/search_user_form.tpl
@@ -1,11 +1,11 @@
 {pageaddvar name="javascript" value="system/Search/javascript/search_user_form.js"}
-{gt text='Search keywords' assign='templatetitle' domain='zikula'}
+{gt text='Site search' assign='templatetitle' domain='zikula'}
 {include file='search_user_menu.tpl'}
 
 <form class="z-form" id="search_form" method="post" action="{modurl modname='Search' type='user' func='search'}">
     <fieldset>
         <div class="z-formrow">
-            <label for="search_q" id="search_q_label">{$templatetitle}</label>
+            <label for="search_q" id="search_q_label">{gt text='Search keywords' domain='zikula'}</label>
             <input type="text" id="search_q" name="q" size="20" maxlength="255" value="{$q|safetext}" />
         </div>
         <div class="z-formrow">