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

Merge "Stopping display of pages in shared to group if outside access time"

parents 03c65555 94e25ce5
......@@ -4412,6 +4412,8 @@ class View {
INNER JOIN {group_member} m ON (a.group = m.group AND (a.role = m.role OR a.role IS NULL))
';
$where = 'WHERE a.group = ? AND m.member = ? AND (v.group IS NULL OR v.group != ?)
AND (a.startdate <= CURRENT_TIMESTAMP OR a.startdate IS NULL)
AND (a.stopdate > CURRENT_TIMESTAMP OR a.stopdate IS NULL)
AND NOT EXISTS (SELECT 1 FROM {collection_view} cv WHERE cv.view = v.id)';
$ph = array($groupid, $userid, $groupid);
if ($membersonly) {
......
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