Commit 71c8efa8 authored by Robert Lyon's avatar Robert Lyon

Bug 1798932: Ignore ctime when compare different access rules

When merging rules for pages of a collection

behatnotneeded

Change-Id: I106dfa12c7836356f2c0e65e55fa68339919d0cb
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 3127523e
......@@ -1111,7 +1111,7 @@ class View {
if ($item['role'] && isset($item['group'])) {
$item['roledisplay'] = get_string($item['role'], 'grouptype.'.$grouptypes[$item['group']]->grouptype);
}
else {
else if ($item['role']) {
$item['roledisplay'] = get_string($item['role'], 'view');
}
if ($timeformat) {
......@@ -1633,6 +1633,7 @@ class View {
foreach ($access as &$a) {
unset($a->id);
unset($a->view);
unset($a->ctime);
$k = serialize($a);
if (!isset($unique[$k])) {
$unique[$k] = $a;
......
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