MDL-21045, MDL-21046 restore - gradebook categories, letters and outc…

…omes are now

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

backup/restorelib.php

@@ -1729,7 +1729,7 @@ function restore_migrate_old_gradebook($restore,$xml_file) {
         $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 {
@@ -1920,7 +1920,7 @@ function restore_create_gradebook($restore,$xml_file) {
         $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 {