MDL-21045, MDL-21046 restore - gradebook categories, letters and outcomes are now

restored no matter if user info is enabled or no (as far as they are user-independent)
Merged from 19_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 4c7cbb30bc60f23a18c1579f1149e4513dbf3083..7908e3422dc733ab9ae435e05684df49ebcb88d6 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1794,7 +1794,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         $restoreall = true;  // set to false if any grade_item is not selected/restored
         $importing  = !empty($SESSION->restore->importing); // there should not be a way to import old backups, but anyway ;-)
 
-        if ($importing || $restore->users == 2) {
+        if ($importing) {
             $restoreall = false;
 
         } else {
@@ -1985,7 +1985,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         $restoreall = true;  // set to false if any grade_item is not selected/restored or already exist
         $importing  = !empty($SESSION->restore->importing);
 
-        if ($importing || $restore->users == 2) {
+        if ($importing) {
             $restoreall = false;
 
         } else {