From: stronk7 <stronk7>
Date: Fri, 30 Jan 2009 09:58:59 +0000 (+0000)
Subject: MDL-18066 - import_backup_file_silently - better handling of missing $USER. Merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=569c6937191ced471c74df43b097edc44ce73a34;p=moodle.git

MDL-18066 - import_backup_file_silently - better handling of missing $USER. Merged from 19_STABLE
---

diff --git a/backup/lib.php b/backup/lib.php
index 2972570803..f7ee0657df 100644
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -497,7 +497,7 @@
     function import_backup_file_silently($pathtofile,$destinationcourse,$emptyfirst=false,$userdata=false, $preferences=array()) {
         global $CFG,$SESSION,$USER, $DB; // is there such a thing on cron? I guess so..
         global $restore; // ick
-        if (empty($USER)) {
+        if (empty($USER) || empty($USER->id)) {
             session_set_user(get_admin());
             $USER->admin = 1; // not sure why, but this doesn't get set
         }