diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 18:08:10 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 18:08:10 +0200 |
| commit | 722fe0ca482aa4f0ff757cdf0651f461e35ba1f1 (patch) | |
| tree | a0826301520689a9fa8195df9fc93e28e691479f /phpBB | |
| parent | 89a564adb22fda151e8d3c1f0e5eacdbf624d63a (diff) | |
| parent | 55a057056702dfadcdb2e7bb29da320c7d845859 (diff) | |
| download | forums-722fe0ca482aa4f0ff757cdf0651f461e35ba1f1.tar forums-722fe0ca482aa4f0ff757cdf0651f461e35ba1f1.tar.gz forums-722fe0ca482aa4f0ff757cdf0651f461e35ba1f1.tar.bz2 forums-722fe0ca482aa4f0ff757cdf0651f461e35ba1f1.tar.xz forums-722fe0ca482aa4f0ff757cdf0651f461e35ba1f1.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/search.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 07779353b7..0d9b2bbfe8 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -693,8 +693,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var string show_results String indicating the show results mode * @var string sql_where The SQL WHERE string used by search to get topic data * @var int total_match_count The total number of search matches + * @var array ex_fid_ary Array of excluded forum ids * @since 3.1.7-RC1 * @changed 3.1.10-RC1 Added show_results, sql_where, total_match_count + * @changed 3.1.11-RC1 Added ex_fid_ary */ $vars = array( 'u_search', @@ -702,6 +704,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'show_results', 'sql_where', 'total_match_count', + 'ex_fid_ary', ); extract($phpbb_dispatcher->trigger_event('core.search_modify_url_parameters', compact($vars))); |