From: skodak <skodak>
Date: Thu, 5 Jun 2008 00:07:29 +0000 (+0000)
Subject: MDL-15095 fixed role names restore warning
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4be1663d392dddb067867e627f0f0903e3d14f04;p=moodle.git

MDL-15095 fixed role names restore warning
---

diff --git a/backup/restorelib.php b/backup/restorelib.php
index b6da844a9d..faacab466a 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -8341,9 +8341,9 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             /// 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)) {
+                if (!empty($newrole->new_id) && !empty($coursecontext) && !empty($roledata->nameincourse)) {
                 /// Check the role hasn't any custom name in context
-                    if (!record_exists('role_names', 'roleid', $newrole->new_id, 'contextid', $coursecontext->id)) {
+                    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;