mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Advanced search now working as intended.

Browse Source
This commit is contained in:
Cameron
2014-12-08 18:45:16 -08:00
parent 60f4800a92
commit 01d9720121
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
search.php
View File

@@ -694,7 +694,7 @@ class search extends e_shortcode
$ns = e107::getRender(); $ns = e107::getRender();
$sch = new e_search; $sch = new e_search;
$tp = e107::getParser(); $tp = e107::getParser();
$query = $this->query; $query = $this->query;
@@ -731,11 +731,12 @@ class search extends e_shortcode
{ {
continue; continue;
} }
$obj = new $className; $obj = new $className;
$where = (method_exists($obj,'where')) ? $obj->where($_GET) : ""; $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'],"<div class='alert alert-danger'>".LAN_198."</div>"), $where , $this->search_info[$key]['order']);
$text .= '<div class="search-block">'; $text .= '<div class="search-block">';
$text .= $ps['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') if ($gk != 't' && $gk != 'q' && $gk != 'r' && $gk != 'in' && $gk != 'ex' && $gk != 'ep' && $gk != 'be' && $gk != 'adv')
{ {
unset($_GET[$gk]); // unset($_GET[$gk]);
} }
} }
} }