MDL-17009 Restore of mnet users: Fix incorrectly named MNET_EXTERNALUSERS. Merged...

diff --git a/backup/restore_check.html b/backup/restore_check.html
index 2cac66f2bdce66dd8fcce7b7923a11d46c0b7f6b..0a0eca910a0ff33ea50754d30d01d0e56ee13a36 100644 (file)
--- 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 '<p>'.get_string('mnetrestore_extusers','admin').'</p>';
                 } else {

diff --git a/backup/restorelib.php b/backup/restorelib.php
index e974ab4ca43f606ebbf532ee7cc3cf85fd14005e..ba6ebd4194082a37eff7180708bf18c062166bd3 100644 (file)
--- 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;
                     }
                 }