From bc15445b58403c92ebca9e23ef3d9a59fbdccc92 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 1 Oct 2006 08:48:32 +0000 Subject: - forgot to make the same change to the ODBC driver - MySQL 3.x works now - FirebirdSQL is now on the same level as MySQL and PostgreSQL, zero hacks exist inside the core code now git-svn-id: file:///svn/phpbb/trunk@6422 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_display.php | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'phpBB/includes/functions_display.php') diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index e241c1e83e..825b92cae1 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1046,21 +1046,8 @@ function display_user_activity(&$userdata) WHERE poster_id = ' . $userdata['user_id'] . " AND post_postcount = 1 $forum_sql - GROUP BY forum_id"; - - // Firebird does not support ORDER BY on aliased columns - // MySQL does not support ORDER BY on functions - switch (SQL_LAYER) - { - case 'firebird': - $sql .= ' ORDER BY COUNT(post_id) DESC'; - break; - - default: - $sql .= ' ORDER BY num_posts DESC'; - break; - } - + GROUP BY forum_id + ORDER BY num_posts DESC"; $result = $db->sql_query_limit($sql, 1); $active_f_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -1081,21 +1068,8 @@ function display_user_activity(&$userdata) WHERE poster_id = ' . $userdata['user_id'] . " AND post_postcount = 1 $forum_sql - GROUP BY topic_id"; - - // Firebird does not support ORDER BY on aliased columns - // MySQL does not support ORDER BY on functions - switch (SQL_LAYER) - { - case 'firebird': - $sql .= ' ORDER BY COUNT(post_id) DESC'; - break; - - default: - $sql .= ' ORDER BY num_posts DESC'; - break; - } - + GROUP BY topic_id + ORDER BY num_posts DESC"; $result = $db->sql_query_limit($sql, 1); $active_t_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); -- cgit v1.2.1