aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-03-24 17:22:07 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-03-24 17:22:07 +0100
commit51c243f76bdd98ecce2592d56284820a9bbf541e (patch)
tree75498c59476ea0bad94a6c014da2f5aa6ba14d01 /phpBB
parentd817da60493957417acc8c2bd314a88ae367b447 (diff)
parent1721965c38a2943d370a41098b1b27eaac7c2fbe (diff)
downloadforums-51c243f76bdd98ecce2592d56284820a9bbf541e.tar
forums-51c243f76bdd98ecce2592d56284820a9bbf541e.tar.gz
forums-51c243f76bdd98ecce2592d56284820a9bbf541e.tar.bz2
forums-51c243f76bdd98ecce2592d56284820a9bbf541e.tar.xz
forums-51c243f76bdd98ecce2592d56284820a9bbf541e.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/viewforum.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 52023359dd..a2ab4d56f5 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -311,7 +311,10 @@ if ($sort_days)
'sql_array',
);
extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sort_data_sql', compact($vars)));
+
$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']))
{