Commit 6bf5a2bb authored by Francois Marier's avatar Francois Marier Committed by Gerrit Code Review
Browse files

Merge "Reduce the selection of users in activity type lookup by removing deleted users."

parents 2b6cd906 3af8ecb5
......@@ -117,7 +117,7 @@ function activity_get_users($activitytype, $userids=null, $userobjs=null, $admin
ON (aic.instance = ai.id AND aic.field = \'wwwroot\')
LEFT OUTER JOIN {host} h
ON aic.value = h.wwwroot
WHERE TRUE';
WHERE u.deleted = 0';
if (!empty($userobjs) && is_array($userobjs)) {
$sql .= ' AND u.id IN (' . implode(',',db_array_to_ph($userobjs)) . ')';
$values = array_merge($values, array_to_fields($userobjs));
......
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