From: danmarsden <danmarsden>
Date: Wed, 15 Apr 2009 02:16:17 +0000 (+0000)
Subject: MDL-18818 - don't define var if already defined - happens when these functions are... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=062173b09bbe25c64113db388d578336d972fb9e;p=moodle.git

MDL-18818 - don't define var if already defined - happens when these functions are called more than once at a time.
---

diff --git a/backup/lib.php b/backup/lib.php
index e635b0caa8..30746b2b12 100644
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -498,7 +498,9 @@
         global $CFG,$SESSION,$USER, $DB; // is there such a thing on cron? I guess so..
         global $restore; // ick
 
-        define('RESTORE_SILENTLY',true); // don't output all the stuff to us.
+        if (!defined('RESTORE_SILENTLY')) {
+            define('RESTORE_SILENTLY',true); // don't output all the stuff to us.
+        }
 
         $debuginfo = 'import_backup_file_silently: ';
         $cleanupafter = false;
@@ -618,7 +620,9 @@
     */
     function backup_course_silently($courseid, $prefs, &$errorstring) {
         global $CFG, $preferences, $DB; // global preferences here because something else wants it :(
-        define('BACKUP_SILENTLY', 1);
+        if (!defined('BACKUP_SILENTLY')) {
+            define('BACKUP_SILENTLY', 1);
+        }
         if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
             debugging("Couldn't find course with id $courseid in backup_course_silently");
             return false;