mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge branch '3.1.x'
* 3.1.x: [ticket/14098] Add core events to the search backends
This commit is contained in:
@@ -379,7 +379,7 @@ class fulltext_mysql extends \phpbb\search\base
|
||||
}
|
||||
|
||||
// generate a search_key from all the options to identify the results
|
||||
$search_key = md5(implode('#', array(
|
||||
$search_key_array = array(
|
||||
implode(', ', $this->split_words),
|
||||
$type,
|
||||
$fields,
|
||||
@@ -390,7 +390,39 @@ class fulltext_mysql extends \phpbb\search\base
|
||||
implode(',', $ex_fid_ary),
|
||||
$post_visibility,
|
||||
implode(',', $author_ary)
|
||||
)));
|
||||
);
|
||||
|
||||
/**
|
||||
* Allow changing the search_key for cached results
|
||||
*
|
||||
* @event core.search_mysql_by_keyword_modify_search_key
|
||||
* @var array search_key_array Array with search parameters to generate the search_key
|
||||
* @var string type Searching type ('posts', 'topics')
|
||||
* @var string fields Searching fields ('titleonly', 'msgonly', 'firstpost', 'all')
|
||||
* @var string terms Searching terms ('all', 'any')
|
||||
* @var int sort_days Time, in days, of the oldest possible post to list
|
||||
* @var string sort_key The sort type used from the possible sort types
|
||||
* @var int topic_id Limit the search to this topic_id only
|
||||
* @var array ex_fid_ary Which forums not to search on
|
||||
* @var string post_visibility Post visibility data
|
||||
* @var array author_ary Array of user_id containing the users to filter the results to
|
||||
* @since 3.1.7-RC1
|
||||
*/
|
||||
$vars = array(
|
||||
'search_key_array',
|
||||
'type',
|
||||
'fields',
|
||||
'terms',
|
||||
'sort_days',
|
||||
'sort_key',
|
||||
'topic_id',
|
||||
'ex_fid_ary',
|
||||
'post_visibility',
|
||||
'author_ary',
|
||||
);
|
||||
extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_by_keyword_modify_search_key', compact($vars)));
|
||||
|
||||
$search_key = md5(implode('#', $search_key_array));
|
||||
|
||||
if ($start < 0)
|
||||
{
|
||||
@@ -610,7 +642,7 @@ class fulltext_mysql extends \phpbb\search\base
|
||||
}
|
||||
|
||||
// generate a search_key from all the options to identify the results
|
||||
$search_key = md5(implode('#', array(
|
||||
$search_key_array = array(
|
||||
'',
|
||||
$type,
|
||||
($firstpost_only) ? 'firstpost' : '',
|
||||
@@ -623,7 +655,39 @@ class fulltext_mysql extends \phpbb\search\base
|
||||
$post_visibility,
|
||||
implode(',', $author_ary),
|
||||
$author_name,
|
||||
)));
|
||||
);
|
||||
|
||||
/**
|
||||
* Allow changing the search_key for cached results
|
||||
*
|
||||
* @event core.search_mysql_by_author_modify_search_key
|
||||
* @var array search_key_array Array with search parameters to generate the search_key
|
||||
* @var string type Searching type ('posts', 'topics')
|
||||
* @var boolean firstpost_only Flag indicating if only topic starting posts are considered
|
||||
* @var int sort_days Time, in days, of the oldest possible post to list
|
||||
* @var string sort_key The sort type used from the possible sort types
|
||||
* @var int topic_id Limit the search to this topic_id only
|
||||
* @var array ex_fid_ary Which forums not to search on
|
||||
* @var string post_visibility Post visibility data
|
||||
* @var array author_ary Array of user_id containing the users to filter the results to
|
||||
* @var string author_name The username to search on
|
||||
* @since 3.1.7-RC1
|
||||
*/
|
||||
$vars = array(
|
||||
'search_key_array',
|
||||
'type',
|
||||
'firstpost_only',
|
||||
'sort_days',
|
||||
'sort_key',
|
||||
'topic_id',
|
||||
'ex_fid_ary',
|
||||
'post_visibility',
|
||||
'author_ary',
|
||||
'author_name',
|
||||
);
|
||||
extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_by_author_modify_search_key', compact($vars)));
|
||||
|
||||
$search_key = md5(implode('#', $search_key_array));
|
||||
|
||||
if ($start < 0)
|
||||
{
|
||||
|
Reference in New Issue
Block a user