L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DML-10461, timemodified in role_assignements not preserved during restore

Browse Source
This commit is contained in:
toyomoyo
2007-07-19 03:38:59 +00:00
parent 0ef8d9cab6
commit 8da1406e3a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restorelib.php
+1 -1
View File
@@ -6248,7 +6248,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);
}
}
lib/accesslib.php
+6 -3
View File
@@ -1817,7 +1817,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);
@@ -1854,6 +1854,9 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time
return false;
}
if (!$timemodified) {
$timemodified = time();
}
/// Check for existing entry
if ($userid) {
@@ -1873,7 +1876,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time
$newra->enrol = $enrol;
$newra->timestart = $timestart;
$newra->timeend = $timeend;
$newra->timemodified = time();
$newra->timemodified = $timemodified;
$newra->modifierid = empty($USER->id) ? 0 : $USER->id;
$success = insert_record('role_assignments', $newra);
@@ -1885,7 +1888,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time
$newra->enrol = $enrol;
$newra->timestart = $timestart;
$newra->timeend = $timeend;
$newra->timemodified = time();
$newra->timemodified = $timemodified;
$newra->modifierid = empty($USER->id) ? 0 : $USER->id;
$success = update_record('role_assignments', $newra);