diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 17:46:12 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 17:46:12 +0200 |
| commit | 1f42da7ba57436161b0150967c01300b77e9c5e5 (patch) | |
| tree | 155f032613dc4d99449d8fe2fd595954391afdbb /phpBB | |
| parent | 79d6d53296fbbbf829b061192ae00b093e4b0158 (diff) | |
| parent | 83f737a30a980cd76973db3090d840f7d4419184 (diff) | |
| download | forums-1f42da7ba57436161b0150967c01300b77e9c5e5.tar forums-1f42da7ba57436161b0150967c01300b77e9c5e5.tar.gz forums-1f42da7ba57436161b0150967c01300b77e9c5e5.tar.bz2 forums-1f42da7ba57436161b0150967c01300b77e9c5e5.tar.xz forums-1f42da7ba57436161b0150967c01300b77e9c5e5.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/search.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index d9e5d0557a..193316f008 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -323,7 +323,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var array ex_fid_ary Array of excluded forum ids * @var array author_id_ary Array of exclusive author ids * @var string search_id The id of the search request + * @var array id_ary Array of post or topic ids for search result + * @var string show_results 'posts' or 'topics' type of ids * @since 3.1.3-RC1 + * @changed 3.1.10-RC1 Added id_ary, show_results */ $vars = array( 'keywords', @@ -331,6 +334,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'ex_fid_ary', 'author_id_ary', 'search_id', + 'id_ary', + 'show_results', ); extract($phpbb_dispatcher->trigger_event('core.search_modify_param_before', compact($vars))); |