Commit b847b998 authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Exclude owner from 'New page access' notifications for group members (Bug #1267861)"

parents b823c64b dc4d83f6
......@@ -241,12 +241,12 @@ function activity_get_viewaccess_users($view, $owner, $type) {
JOIN {view_access} vg ON vg.group = m.group
JOIN {group} g ON (g.id = vg.group AND g.deleted = 0 AND g.viewnotify = 1)
JOIN {group_member} og ON (g.id = og.group AND og.member = ?)
WHERE vg.view = ? AND (vg.role IS NULL OR vg.role = m.role)
WHERE vg.view = ? AND (vg.role IS NULL OR vg.role = m.role) AND m.member <> ?
) AS userlist
JOIN {usr} u ON u.id = userlist.userid
LEFT JOIN {usr_activity_preference} p ON p.usr = u.id AND p.activity = ?
LEFT JOIN {usr_account_preference} ap ON ap.usr = u.id AND ap.field = 'lang'";
$values = array($owner, $owner, $owner, $view, $view, $owner, $view, $type->id);
$values = array($owner, $owner, $owner, $view, $view, $owner, $view, $owner, $type->id);
if (!$u = get_records_sql_assoc($sql, $values)) {
$u = array();
}
......
Supports Markdown
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