diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-10-01 08:48:32 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-10-01 08:48:32 +0000 |
| commit | bc15445b58403c92ebca9e23ef3d9a59fbdccc92 (patch) | |
| tree | 46880b44be1949f01ada2f29e7f3f42ab4123c1b /phpBB/includes/functions_display.php | |
| parent | bc770de9b93973a359a46ef39838e89f18e685ae (diff) | |
| download | forums-bc15445b58403c92ebca9e23ef3d9a59fbdccc92.tar forums-bc15445b58403c92ebca9e23ef3d9a59fbdccc92.tar.gz forums-bc15445b58403c92ebca9e23ef3d9a59fbdccc92.tar.bz2 forums-bc15445b58403c92ebca9e23ef3d9a59fbdccc92.tar.xz forums-bc15445b58403c92ebca9e23ef3d9a59fbdccc92.zip | |
- 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
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 34 |
1 files changed, 4 insertions, 30 deletions
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); |