Merged MDL-13569 Mark N patch for notice

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 73cfc8df14da810fcbb4d8cb0069fdb8ac55ae09..a7470fe824dea8379dd74f50e3cd66d2fa7da851 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -8051,7 +8051,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         foreach ($overrides as $override) {
             $override->capability = $override->name;
             $oldmodifier = backup_getid($restore->backup_unique_code,"user",$override->modifierid);
-            $override->modifierid = $oldmodifier->new_id?$oldmodifier->new_id:0; // new modifier id here
+            $override->modifierid = !empty($oldmodifier->new_id)?$oldmodifier->new_id:0; // new modifier id here
             $override->roleid = $role->new_id; // restored new role id
 
             // hack to make the correct contextid for course level imports