diff --git a/search2/search/expr.inc.php b/search2/search/expr.inc.php index 3d94700..73d07ad 100755 --- a/search2/search/expr.inc.php +++ b/search2/search/expr.inc.php @@ -2317,9 +2317,12 @@ class OpExpr extends Expr } $permResults = array(); - foreach($result[$resultContext] as $idx=>$item) + if(isset($result[$resultContext])) { - $permResults[$resultContext][$idx] = $item; + foreach($result[$resultContext] as $idx=>$item) + { + $permResults[$resultContext][$idx] = $item; + } } return $permResults; diff --git a/search2/search/fields/FullPathField.inc.php b/search2/search/fields/FullPathField.inc.php index b758b06..4cc5437 100644 --- a/search2/search/fields/FullPathField.inc.php +++ b/search2/search/fields/FullPathField.inc.php @@ -61,7 +61,7 @@ class FullPathField extends DBFieldExpr } } - public function appliesToContext($context) + public function appliesToContext() { return ExprContext::DOCUMENT | ExprContext::FOLDER; } diff --git a/search2/search/search.inc.php b/search2/search/search.inc.php index f9a6e44..de70da0 100755 --- a/search2/search/search.inc.php +++ b/search2/search/search.inc.php @@ -570,6 +570,11 @@ function processSearchExpression($query) $rs = $expr->evaluate(ExprContext::DOCUMENT); $rs = $rs['docs']; + + if(empty($rs)){ + return array(); + } + usort($rs, 'rank_compare'); $results = array();