Changeset 29805

Timestamp:

Sep 26, 2014, 10:17:15 PM (10 years ago)

Author:

rvelices

Message:

bug 3148: quick search Merged -r29804 from trunk to branch 2.7

Location:

branches/2.7

Files:

• include/functions_search.inc.php (modified) (5 diffs)
• index.php (modified) (1 diff)

branches/2.7/include/functions_search.inc.php

@@ -385 +385 @@
   {
     $clauses = array();
-    if ($token->scope_data['range'][0]!=='')
+    if ($token->scope_data['range'][0]!='')
       $clauses[] = $field.' >'.($token->scope_data['strict'][0]?'':'=').$token->scope_data['range'][0].' ';
-    if ($token->scope_data['range'][1]!=='')
+    if ($token->scope_data['range'][1]!='')
       $clauses[] = $field.' <'.($token->scope_data['strict'][1]?'':'=').$token->scope_data['range'][1].' ';
 
@@ -459 +459 @@
   {
     $clauses = array();
-    if ($token->scope_data[0]!=='')
+    if ($token->scope_data[0]!='')
       $clauses[] = $field.' >= \'' . $token->scope_data[0].'\'';
-    if ($token->scope_data[1]!=='')
+    if ($token->scope_data[1]!='')
       $clauses[] = $field.' <= \'' . $token->scope_data[1].'\'';
 
@@ -1082 +1082 @@
       $crt_ids = $qsr->iids[$crt->idx] = array_unique( array_merge($qsr->images_iids[$crt->idx], $qsr->tag_iids[$crt->idx]) );
       $crt_qualifies = count($crt_ids)>0 || count($qsr->tag_ids[$crt->idx])>0;
-      $crt_ignored_terms = $crt_qualifies ? array() : array($crt->term);
+      $crt_ignored_terms = $crt_qualifies ? array() : array((string)$crt);
     }
     else
@@ -1173 +1173 @@
     );
 
+  $q = trigger_change('qsearch_pre', $q);
+
   $scopes = array();
   $scopes[] = new QSearchScope('tag', array('tags'));
@@ -1248 +1250 @@
 
   $search_results['qs']['matching_tags'] = $qsr->all_tags;
+  $search_results = trigger_change('qsearch_results', $search_results, $expression, $qsr);
+
   global $template;
 

branches/2.7/index.php

@@ -246 +246 @@
     elseif (!empty($page['qsearch_details']['unmatched_terms']))
     {
-      $template->assign( 'no_search_results', $page['qsearch_details']['unmatched_terms']);
+      $template->assign( 'no_search_results', array_map($page['qsearch_details']['unmatched_terms'], 'htmlspecialchars'));
     }
   }