From 97a4479513130658fffdcc1f8ef0d349f08520bc Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Jun 2014 18:19:27 -0700 Subject: don't provide a second (actually third counting the navbar) search box on the search page if you've got saved searches turned on. This should solve some problems with duplicate html id's (and save wasn't working anyway). If you don't have saved search ability (which will provide a saved search widget in the sidebar), provide a simple search box in the main content region but without save ability. --- include/widgets.php | 2 +- mod/search.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index c7a4da6a0..d197eb240 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -264,7 +264,7 @@ function widget_savedsearch($arr) { $o = replace_macros($tpl, array( '$title' => t('Saved Searches'), '$add' => t('add'), - '$searchbox' => searchbox('','netsearch-box',$srchurl . (($hasq) ? '' : '?f='),true), + '$searchbox' => searchbox($search,'netsearch-box',$srchurl . (($hasq) ? '' : '?f='),true), '$saved' => $saved, )); diff --git a/mod/search.php b/mod/search.php index 16837a107..2c2e8c86a 100644 --- a/mod/search.php +++ b/mod/search.php @@ -39,7 +39,8 @@ function search_content(&$a,$update = 0, $load = false) { $search = ((x($_GET,'tag')) ? trim(rawurldecode($_GET['tag'])) : ''); } - $o .= search($search,'search-box','/search',((local_user()) ? true : false)); + if((! local_user()) || (! feature_enabled(local_user(),'savedsearch'))) + $o .= search($search,'search-box','/search',((local_user()) ? true : false)); if(strpos($search,'#') === 0) { $tag = true; -- cgit v1.2.3