From ae34cad5fd3349f8f60b4a1fe09ad9e6a23196b7 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Tue, 30 May 2006 16:58:50 +0000 Subject: [PATCH] Users with messages (and messages) are only included in SITEID backup. Bug 5658. (http://moodle.org/bugs/bug.php?op=show&bugid=5658) Merged from MOODLE_16_STABLE --- backup/backup_scheduled.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backup/backup_scheduled.php b/backup/backup_scheduled.php index dfdc8f5080d..e6ebd5664f7 100644 --- a/backup/backup_scheduled.php +++ b/backup/backup_scheduled.php @@ -334,7 +334,7 @@ function schedule_backup_course_configure($course,$starttime = 0) { $backup_config->backup_sche_coursefiles = 1; } if (!isset($backup_config->backup_sche_messages)) { - $backup_config->backup_sche_messages = 1; + $backup_config->backup_sche_messages = 0; } if (!isset($backup_config->backup_sche_active)) { $backup_config->backup_sche_active = 0; @@ -513,7 +513,13 @@ function schedule_backup_course_configure($course,$starttime = 0) { //Now calculate the users if ($status) { schedule_backup_log($starttime,$course->id," calculating users"); - user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$preferences->backup_messages); + //Decide about include users with messages, based on SITEID + if ($preferences->backup_messages && $preferences->backup_course == SITEID) { + $include_message_users = true; + } else { + $include_message_users = false; + } + user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$include_message_users); } //Now calculate the logs