From 5d3f609b9cb8117476d5490213207ed8438cb5a5 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 19 Aug 2014 13:08:40 -0400 Subject: [PATCH] member output for search form setting up member output so if they choose to have a search form it will still list out the members also. --- Toolkit/Members/SearchList.php | 2 +- Toolkit/Template/Page/Member.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Toolkit/Members/SearchList.php b/Toolkit/Members/SearchList.php index bf0ceb5..1070925 100644 --- a/Toolkit/Members/SearchList.php +++ b/Toolkit/Members/SearchList.php @@ -679,7 +679,7 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder $this->ctrlObj['letters'] = $this->getAlphaList(); $this->ctrlObj['searchMapIconActive'] = $searchMapIconActive; - if (isset($_GET['search']) && $this->showSearchBox) { + if ($this->showSearchBox) { $action = MEDIA_BASE_URL . "index.php?{$_SERVER['QUERY_STRING']}"; $form = new Toolkit_Members_UserSearchForm( 'SearchForm', diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php index aa8dbf7..7a9bd98 100644 --- a/Toolkit/Template/Page/Member.php +++ b/Toolkit/Template/Page/Member.php @@ -135,7 +135,7 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox 50, null, null, - true + (bool)$page['search_form'] ); $searchList->setConfig($this->_configContainer); @@ -371,12 +371,14 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox if (filter_input(INPUT_GET, 'member_id', FILTER_VALIDATE_INT)) { $tPage->profile = $this->_getMemberProfilePage($this->id); - } elseif (!$page['search_form']) { + } elseif ($page['search_form']) { +// $tPage->searchForm = $this->_getMemberSearchForm($this->id); $tPage->searchResults = $this->_getMemberSearchResults($this->id); } elseif (isset($_GET['search'])) { $tPage->searchResults = $this->_getMemberSearchResults($this->id); } else { - $tPage->searchForm = $this->_getMemberSearchForm($this->id); +// $tPage->searchForm = $this->_getMemberSearchForm($this->id); + $tPage->searchResults = $this->_getMemberSearchResults($this->id); } return $tPage; // $tpl->compile('toolbox.html'); -- 2.17.1