Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-03-24 17:22:39 +01:00
commit 46faec12fa

View file

@ -311,7 +311,10 @@ if ($sort_days)
'sql_array', 'sql_array',
); );
extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sort_data_sql', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sort_data_sql', compact($vars)));
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_array)); $result = $db->sql_query($db->sql_build_query('SELECT', $sql_array));
$topics_count = (int) $db->sql_fetchfield('num_topics');
$db->sql_freeresult($result);
if (isset($_POST['sort'])) if (isset($_POST['sort']))
{ {