Commit 2285d783 authored by Robert Lyon's avatar Robert Lyon Committed by Cecilia Vela Gurovic
Browse files

Bug 1798932: Ignore ctime when compare different access rules 



When merging rules for pages of a collection

behatnotneeded

Change-Id: I106dfa12c7836356f2c0e65e55fa68339919d0cb
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 71c8efa8)
parent 389a8fe6

htdocs/lib/view.php

+2 −1
Original line number Diff line number Diff line
@@ -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;