adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-09 10:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 3010 : replace trigger_action/event by trigger_notify/change

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@28587 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-06-02 07:55:46 +00:00
parent f98edc7a2e
commit 4bd32005b5
62 changed files with 322 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_search.inc.php
+5 -5
View File
@@ -928,7 +928,7 @@ function qsearch_get_images(QExpression $expr, QResults $qsr)
break;
default:
// allow plugins to have their own scope with columns added in db by themselves
$clauses = trigger_event('qsearch_get_images_sql_scopes', $clauses, $token, $expr);
$clauses = trigger_change('qsearch_get_images_sql_scopes', $clauses, $token, $expr);
break;
}
if (!empty($clauses))
@@ -1019,7 +1019,7 @@ SELECT image_id FROM '.IMAGE_TAG_TABLE.'
usort($all_tags, 'tag_alpha_compare');
foreach ( $all_tags as &$tag )
{
$tag['name'] = trigger_event('render_tag_name', $tag['name'], $tag);
$tag['name'] = trigger_change('render_tag_name', $tag['name'], $tag);
}
$qsr->all_tags = $all_tags;
$qsr->tag_ids = $token_tag_ids;
@@ -1151,7 +1151,7 @@ function get_quick_search_results_no_cache($q, $options)
$scopes[] = new QDateRangeScope('posted', $postedDateAliases);
// allow plugins to add their own scopes
$scopes = trigger_event('qsearch_get_scopes', $scopes);
$scopes = trigger_change('qsearch_get_scopes', $scopes);
$expression = new QExpression($q, $scopes);
// get inflections for terms
@@ -1176,7 +1176,7 @@ function get_quick_search_results_no_cache($q, $options)
}
trigger_action('qsearch_expression_parsed', $expression);
trigger_notify('qsearch_expression_parsed', $expression);
//var_export($expression);
if (count($expression->stokens)==0)
@@ -1188,7 +1188,7 @@ function get_quick_search_results_no_cache($q, $options)
qsearch_get_images($expression, $qsr);
// allow plugins to evaluate their own scopes
trigger_action('qsearch_before_eval', $expression, $qsr);
trigger_notify('qsearch_before_eval', $expression, $qsr);
$ids = qsearch_eval($expression, $qsr, $tmp, $search_results['qs']['unmatched_terms']);