From: Eloy Lafuente <stronk7@moodle.org>
Date: Fri, 18 Dec 2009 18:48:44 +0000 (+0000)
Subject: MDL-21045, MDL-21046 restore - gradebook categories, letters and outcomes are now
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ead791ddd503268a018e5acbe8ed5874ab6408fe;p=moodle.git

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 4c7cbb30bc..7908e3422d 100644
--- 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 {