From 01d9720121620430af0a7b76d5281376d4b246b3 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 8 Dec 2014 18:45:16 -0800 Subject: [PATCH] Advanced search now working as intended. --- search.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/search.php b/search.php index c76b699c2..9b2525f5a 100644 --- a/search.php +++ b/search.php @@ -694,7 +694,7 @@ class search extends e_shortcode $ns = e107::getRender(); $sch = new e_search; $tp = e107::getParser(); - + $query = $this->query; @@ -731,11 +731,12 @@ class search extends e_shortcode { continue; } + $obj = new $className; - + $where = (method_exists($obj,'where')) ? $obj->where($_GET) : ""; - $ps = $obj->parsesearch($this->search_info[$key]['table'], $this->search_info[$key]['return_fields'], $this->search_info[$key]['search_fields'], $this->search_info[$key]['weights'], 'self', varset($this->search_info[$key]['no_results'],LAN_198), $where , $this->search_info[$key]['order']); + $ps = $obj->parsesearch($this->search_info[$key]['table'], $this->search_info[$key]['return_fields'], $this->search_info[$key]['search_fields'], $this->search_info[$key]['weights'], 'self', varset($this->search_info[$key]['no_results'],"
".LAN_198."
"), $where , $this->search_info[$key]['order']); $text .= '
'; $text .= $ps['text']; @@ -1128,7 +1129,7 @@ if (!varsettrue($_GET['adv']) || $_GET['t'] == 'all') { if ($gk != 't' && $gk != 'q' && $gk != 'r' && $gk != 'in' && $gk != 'ex' && $gk != 'ep' && $gk != 'be' && $gk != 'adv') { - unset($_GET[$gk]); +// unset($_GET[$gk]); } } }