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

diff --git a/backup/lib.php b/backup/lib.php
index 297257080366380a9bb8810c238db38323d0fc39..f7ee0657df4fda225627e21ebb3c45e82362e836 100644 (file)
--- 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
         }