diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index ab5150bf8d..554bda47b5 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -410,11 +410,9 @@ $sql_array = array(
// Funnily enough you typically save one query if going from the last page to the middle (store_reverse) because
// the number of stickies are not known
$sql = $db->sql_build_query('SELECT', $sql_array);
-//$sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_NORMAL : POST_STICKY, $sql);
$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
$shadow_topic_list = array();
-//$num_rows = 0;
while ($row = $db->sql_fetchrow($result))
{
if ($row['topic_status'] == ITEM_MOVED)
@@ -424,30 +422,9 @@ while ($row = $db->sql_fetchrow($result))
$rowset[$row['topic_id']] = $row;
$topic_list[] = $row['topic_id'];
-// $num_rows++;
}
$db->sql_freeresult($result);
-/* If the number of topics exceeds the sql limit then we do not need to retrieve the remaining topic type
-if ($num_rows < $sql_limit)
-{
- $sql = $db->sql_build_query('SELECT', $sql_array);
- $sql = str_replace('{SQL_TOPIC_TYPE}', ($store_reverse) ? POST_STICKY : POST_NORMAL, $sql);
- $result = $db->sql_query_limit($sql, $sql_limit - $num_rows, $sql_start);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if ($row['topic_status'] == ITEM_MOVED)
- {
- $shadow_topic_list[$row['topic_moved_id']] = $row['topic_id'];
- }
-
- $rowset[$row['topic_id']] = $row;
- $topic_list[] = $row['topic_id'];
- }
- $db->sql_freeresult($result);
-}
-*/
// If we have some shadow topics, update the rowset to reflect their topic information
if (sizeof($shadow_topic_list))
{
@@ -460,6 +437,17 @@ if (sizeof($shadow_topic_list))
{
$orig_topic_id = $shadow_topic_list[$row['topic_id']];
+ // If the shadow topic is already listed within the rowset (happens for active topics for example), then do not include it...
+ if (isset($rowset[$row['topic_id']]))
+ {
+ // We need to remove any trace regarding this topic. :)
+ unset($rowset[$orig_topic_id]);
+ unset($topic_list[array_search($orig_topic_id, $topic_list)]);
+ $topics_count--;
+
+ continue;
+ }
+
// Do not include those topics the user has no permission to access
if (!$auth->acl_get('f_read', $row['forum_id']))
{
@@ -483,6 +471,12 @@ if (sizeof($shadow_topic_list))
}
unset($shadow_topic_list);
+// Ok, adjust topics count for active topics list
+if ($s_display_active)
+{
+ $topics_count = 1;
+}
+
$template->assign_vars(array(
'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param"), $topics_count, $config['topics_per_page'], $start),
'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start),
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 785dce5229..4a862c4367 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -363,11 +363,27 @@ unset($vars_online);
$pagination = generate_pagination(append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"), $counter, $config['topics_per_page'], $start);
// Grab group details for legend display
-$sql = 'SELECT group_id, group_name, group_colour, group_type
- FROM ' . GROUPS_TABLE . '
- WHERE group_legend = 1
- AND group_type <> ' . GROUP_HIDDEN . '
- ORDER BY group_name ASC';
+if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
+{
+ $sql = 'SELECT group_id, group_name, group_colour, group_type
+ FROM ' . GROUPS_TABLE . '
+ WHERE group_legend = 1
+ ORDER BY group_name ASC';
+}
+else
+{
+ $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
+ FROM ' . GROUPS_TABLE . ' g
+ LEFT JOIN ' . USER_GROUP_TABLE . ' ug
+ ON (
+ g.group_id = ug.group_id
+ AND ug.user_id = ' . $user->data['user_id'] . '
+ AND ug.user_pending = 0
+ )
+ WHERE g.group_legend = 1
+ AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')
+ ORDER BY g.group_name ASC';
+}
$result = $db->sql_query($sql);
$legend = '';