merged, taking care of a warning

diff --git a/lib/dmllib.php b/lib/dmllib.php
index ed26d18c8c5d126af77742aeed31d1908bf4edf6..a4491aa035c4d7f64b57b1573277d40c7a8ae015 100644 (file)
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -1301,8 +1301,10 @@ function update_record($table, $dataobject) {
 
     // Remove this record from record cache since it will change
     global $record_cache;
-    unset($record_cache[$table][$dataobject->id]);
-
+    if (isset($record_cache[$table][$dataobject->id])) {
+        unset($record_cache[$table][$dataobject->id]);
+    }
+    
 /// Temporary hack as part of phasing out all access to obsolete user tables  XXX
     if (!empty($CFG->rolesactive)) {
         if (in_array($table, array('user_students', 'user_teachers', 'user_coursecreators', 'user_admins'))) {