Commit f07d7c1f authored by Andrew Robert Nicols's avatar Andrew Robert Nicols
Browse files

Prevent group views from being listed if the group has been deleted. (Fixes #619168).


Signed-off-by: default avatarAndrew Robert Nicols <andrew.nicols@luns.net.uk>
parent 7e1b4be5
......@@ -2407,7 +2407,7 @@ class View {
FROM {view} v
LEFT OUTER JOIN (
SELECT
gtr.edit_views, gm.group AS groupid
gtr.edit_views, gm.group AS groupid, g.deleted
FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
INNER JOIN {grouptype_roles} gtr ON (g.grouptype = gtr.grouptype AND gtr.role = gm.role)
......@@ -2450,6 +2450,9 @@ class View {
OR (ag.member = ?)
)
)
)
AND (
v.group IS NULL OR vg.deleted = 0
)";
$ph = array_merge(array($viewerid,$viewerid,$viewerid,$viewerid), $ph, array($viewerid,$viewerid,$viewerid,$viewerid));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment