MDL-19084 - backup_course_silently() missing call to xxx__check_backup_mods()

causing quizzes to be incorrect (thanks Piers Harding) plus problems with users,
files and role assignments. Merged from 19_STABLE

diff --git a/backup/lib.php b/backup/lib.php
index 8603a670dce18d10588bada69be7ba2c3e2b3fec..e8f8e11b47f06bad2a0fdae54038078c22187d75 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -657,6 +657,7 @@
         global $CFG, $DB;
         $preferences = new StdClass;
         $preferences->backup_unique_code = time();
+        $preferences->backup_users = (isset($prefs['backup_users']) ? $prefs['backup_users'] : 0);
         $preferences->backup_name = backup_get_zipfile_name($course, $preferences->backup_unique_code);
         $count = 0;
 
@@ -674,6 +675,7 @@
                 if (!function_exists($modbackup) || !function_exists($modcheckbackup)) {
                     continue;
                 }
+                $modcheckbackup($course->id, $preferences->backup_users, $preferences->backup_unique_code);
                 $var = "exists_".$modname;
                 $preferences->$var = true;
                 $count++;
@@ -715,7 +717,6 @@
 
         //Check other parameters
         $preferences->backup_metacourse = (isset($prefs['backup_metacourse']) ? $prefs['backup_metacourse'] : 0);
-        $preferences->backup_users = (isset($prefs['backup_users']) ? $prefs['backup_users'] : 0);
         $preferences->backup_logs = (isset($prefs['backup_logs']) ? $prefs['backup_logs'] : 0);
         $preferences->backup_user_files = (isset($prefs['backup_user_files']) ? $prefs['backup_user_files'] : 0);
         $preferences->backup_course_files = (isset($prefs['backup_course_files']) ? $prefs['backup_course_files'] : 0);
@@ -724,6 +725,28 @@
         $preferences->backup_gradebook_history = (isset($prefs['backup_gradebook_history']) ? $prefs['backup_gradebook_history'] : 0);
         $preferences->backup_blogs = (isset($prefs['backup_blogs']) ? $prefs['backup_blogs'] : 0);
         $preferences->backup_course = $course->id;
+
+        //Check users
+        user_check_backup($course->id,$preferences->backup_unique_code,$preferences->backup_users,$preferences->backup_messages, $preferences->backup_blogs);
+
+        //Check logs
+        log_check_backup($course->id);
+
+        //Check user files
+        user_files_check_backup($course->id,$preferences->backup_unique_code);
+
+        //Check course files
+        course_files_check_backup($course->id,$preferences->backup_unique_code);
+
+        //Check site files
+        site_files_check_backup($course->id,$preferences->backup_unique_code);
+
+        //Role assignments
+        $roles = get_records('role', '', '', 'sortorder');
+        foreach ($roles as $role) {
+            $preferences->backuproleassignments[$role->id] = $role;
+        }
+
         backup_add_static_preferences($preferences);
         return $preferences;
     }