Only create role_name aliases if the original course (backup file) contains them...

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 8786a6533a6b83bfc5bff76722e03870f761e8e3..3d8a422e2bf738bb3f4b08bc75159d3e678beaa8 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -8344,18 +8344,20 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                         $DB->insert_record('role_capabilities', $roleinfo);
                     }
                 }
-            /// Now, restore role nameincourse
-                $newrole = backup_getid($restore->backup_unique_code, 'role', $oldroleid); /// Look for target role
-                $coursecontext = get_context_instance(CONTEXT_COURSE, $restore->course_id); /// Look for target context
-                if (!empty($newrole->new_id) && !empty($coursecontext) && !empty($roledata->nameincourse)) {
-                /// Check the role hasn't any custom name in context
-                    if (!$DB->record_exists('role_names', array('roleid'=>$newrole->new_id, 'contextid'=>$coursecontext->id))) {
-                        $rolename = new object();
-                        $rolename->roleid = $newrole->new_id;
-                        $rolename->contextid = $coursecontext->id;
-                        $rolename->name = $roledata->nameincourse;
-
-                        $DB->insert_record('role_names', $rolename);
+            /// Now, restore role nameincourse (only if the role had nameincourse in backup)
+                if (!empty($roledata->nameincourse)) {
+                    $newrole = backup_getid($restore->backup_unique_code, 'role', $oldroleid); /// Look for target role
+                    $coursecontext = get_context_instance(CONTEXT_COURSE, $restore->course_id); /// Look for target context
+                    if (!empty($newrole->new_id) && !empty($coursecontext) && !empty($roledata->nameincourse)) {
+                    /// Check the role hasn't any custom name in context
+                        if (!$DB->record_exists('role_names', array('roleid'=>$newrole->new_id, 'contextid'=>$coursecontext->id))) {
+                            $rolename = new object();
+                            $rolename->roleid = $newrole->new_id;
+                            $rolename->contextid = $coursecontext->id;
+                            $rolename->name = $roledata->nameincourse;
+
+                            $DB->insert_record('role_names', $rolename);
+                        }
                     }
                 }
             }