diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-25 23:21:09 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-25 23:21:09 -0400 |
| commit | 73aca1a6fb72137befa6b61fba402ebe5e2babe1 (patch) | |
| tree | 8e530b869ead1325644c89e0f5120bd527136d37 /phpBB/includes/functions_display.php | |
| parent | 459570bcca9347f4f115e0e53d098b4ebd4ffc1a (diff) | |
| parent | 0d4089da7fab3c4e2f177ad62bed142d4df181e1 (diff) | |
| download | forums-73aca1a6fb72137befa6b61fba402ebe5e2babe1.tar forums-73aca1a6fb72137befa6b61fba402ebe5e2babe1.tar.gz forums-73aca1a6fb72137befa6b61fba402ebe5e2babe1.tar.bz2 forums-73aca1a6fb72137befa6b61fba402ebe5e2babe1.tar.xz forums-73aca1a6fb72137befa6b61fba402ebe5e2babe1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10320] Exclude passworded forums when determining "Most active topic".
[ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 9c27f7eed1..131e3c1321 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -990,13 +990,17 @@ function display_user_activity(&$userdata) } // Obtain active topic + // We need to exclude passworded forums here so we do not leak the topic title + $forum_ary_topic = array_unique(array_merge($forum_ary, $user->get_passworded_forums())); + $forum_sql_topic = (!empty($forum_ary_topic)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary_topic, true) : ''; + $sql = 'SELECT topic_id, COUNT(post_id) AS num_posts FROM ' . POSTS_TABLE . ' WHERE poster_id = ' . $userdata['user_id'] . " AND post_postcount = 1 AND (post_approved = 1 $sql_m_approve) - $forum_sql + $forum_sql_topic GROUP BY topic_id ORDER BY num_posts DESC"; $result = $db->sql_query_limit($sql, 1); |