diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 09:56:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 09:56:51 +0200 |
| commit | 48dd87bd345a7939e4d5933db4319e753db5228d (patch) | |
| tree | 90778f52906dcf40e0e97e1b4c4015386814a362 | |
| parent | d3ee8d24bc74f8895620da79e0f9fce3e373e55a (diff) | |
| parent | 1b393b1d0b0707c7ddd184c963d5c0d384c6cbee (diff) | |
| download | forums-48dd87bd345a7939e4d5933db4319e753db5228d.tar forums-48dd87bd345a7939e4d5933db4319e753db5228d.tar.gz forums-48dd87bd345a7939e4d5933db4319e753db5228d.tar.bz2 forums-48dd87bd345a7939e4d5933db4319e753db5228d.tar.xz forums-48dd87bd345a7939e4d5933db4319e753db5228d.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/search.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 93f12f4310..58b2bf40cb 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -739,9 +739,11 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var string sql_select The SQL SELECT string used by search to get topic data * @var string sql_from The SQL FROM string used by search to get topic data * @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 * @since 3.1.0-a1 + * @changed 3.1.0-RC5 Added total_match_count */ - $vars = array('sql_select', 'sql_from', 'sql_where'); + $vars = array('sql_select', 'sql_from', 'sql_where', 'total_match_count'); extract($phpbb_dispatcher->trigger_event('core.search_get_topic_data', compact($vars))); $sql = "SELECT $sql_select |