[ticket/452] Correctly select groups selected for displayal in legend
B3P-452
This commit is contained in:
@@ -101,7 +101,7 @@ class leaders extends module_base
|
|||||||
{
|
{
|
||||||
$sql = 'SELECT group_id, group_name, group_colour, group_type
|
$sql = 'SELECT group_id, group_name, group_colour, group_type
|
||||||
FROM ' . GROUPS_TABLE . '
|
FROM ' . GROUPS_TABLE . '
|
||||||
WHERE group_legend = 1
|
WHERE group_legend >= 1
|
||||||
ORDER BY group_name ASC';
|
ORDER BY group_name ASC';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -114,7 +114,7 @@ class leaders extends module_base
|
|||||||
AND ug.user_id = ' . $this->user->data['user_id'] . '
|
AND ug.user_id = ' . $this->user->data['user_id'] . '
|
||||||
AND ug.user_pending = 0
|
AND ug.user_pending = 0
|
||||||
)
|
)
|
||||||
WHERE g.group_legend = 1
|
WHERE g.group_legend >= 1
|
||||||
AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ')
|
AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ')
|
||||||
ORDER BY g.group_name ASC';
|
ORDER BY g.group_name ASC';
|
||||||
}
|
}
|
||||||
@@ -132,7 +132,7 @@ class leaders extends module_base
|
|||||||
}
|
}
|
||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
|
|
||||||
if(sizeof($legends))
|
if (sizeof($legends))
|
||||||
{
|
{
|
||||||
$sql = 'SELECT
|
$sql = 'SELECT
|
||||||
u.user_id AS user_id, u.username AS username, u.username_clean AS username_clean,
|
u.user_id AS user_id, u.username AS username, u.username_clean AS username_clean,
|
||||||
@@ -157,7 +157,7 @@ class leaders extends module_base
|
|||||||
$this->db->sql_freeresult($result);
|
$this->db->sql_freeresult($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(sizeof($groups))
|
if (sizeof($groups))
|
||||||
{
|
{
|
||||||
foreach($groups as $group_id => $group)
|
foreach($groups as $group_id => $group)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user