diff --git a/backup/restorelib.php b/backup/restorelib.php index 0339dcbc2a9..c6b75284194 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -6731,7 +6731,7 @@ $newcontext = get_context_instance($contextlevel, $oldinstance->new_id); $assignment->contextid = $newcontext->id; // new context id // might already have same assignment - role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol); + role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol, $assignment->timemodified); } } diff --git a/lib/accesslib.php b/lib/accesslib.php index 09727be5050..5d7f19ee975 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -2096,7 +2096,7 @@ function get_roles_with_capability($capability, $permission=NULL, $context='') { * @uses $USER * @return id - new id of the assigment */ -function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $timeend=0, $hidden=0, $enrol='manual') { +function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $timeend=0, $hidden=0, $enrol='manual',$timemodified='') { global $USER, $CFG; debugging("Assign roleid $roleid userid $userid contextid $contextid", DEBUG_DEVELOPER); @@ -2133,6 +2133,9 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time return false; } + if (!$timemodified) { + $timemodified = time(); + } /// Check for existing entry if ($userid) { @@ -2154,7 +2157,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time /// by repeating queries with the same exact parameters in a 100 secs time window $newra->timestart = round($timestart, -2); $newra->timeend = $timeend; - $newra->timemodified = time(); + $newra->timemodified = $timemodified; $newra->modifierid = empty($USER->id) ? 0 : $USER->id; $success = insert_record('role_assignments', $newra); @@ -2168,7 +2171,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time /// by repeating queries with the same exact parameters in a 100 secs time window $newra->timestart = round($timestart, -2); $newra->timeend = $timeend; - $newra->timemodified = time(); + $newra->timemodified = $timemodified; $newra->modifierid = empty($USER->id) ? 0 : $USER->id; $success = update_record('role_assignments', $newra);