From: stronk7 Date: Thu, 11 Dec 2008 16:40:09 +0000 (+0000) Subject: MDL-17009 Restore of mnet users: Fix incorrectly named MNET_EXTERNALUSERS. Merged... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b0126ac9da8295f583cc02e46b6a5ba5da6ac174;p=moodle.git MDL-17009 Restore of mnet users: Fix incorrectly named MNET_EXTERNALUSERS. Merged from 19_STABLE --- diff --git a/backup/restore_check.html b/backup/restore_check.html index 2cac66f2bd..0a0eca910a 100644 --- a/backup/restore_check.html +++ b/backup/restore_check.html @@ -301,8 +301,8 @@ $hidden["id"] = $id; print_string('longtimewarning','admin'); - if ($restore->users && !empty($info->mnet_externalusers) - && $info->mnet_externalusers === 'true') { + if ($restore->users && !empty($info->mnet_remoteusers) + && $info->mnet_remoteusers === 'true') { if ($info->original_wwwroot === $CFG->wwwroot) { print '

'.get_string('mnetrestore_extusers','admin').'

'; } else { diff --git a/backup/restorelib.php b/backup/restorelib.php index e974ab4ca4..ba6ebd4194 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -4966,8 +4966,8 @@ define('RESTORE_GROUPS_GROUPINGS', 3); case "ORIGINAL_WWWROOT": $this->info->original_wwwroot = $this->getContents(); break; - case "MNET_EXTERNALUSERS": - $this->info->mnet_externalusers = $this->getContents(); + case "MNET_REMOTEUSERS": + $this->info->mnet_remoteusers = $this->getContents(); break; } }