From: mjollnir_ <mjollnir_>
Date: Mon, 28 Jul 2008 10:44:25 +0000 (+0000)
Subject: MDL-15758 - fixing assignment & resource bugs
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=654119b54e0526bd03ca92b675d380bce8dc0460;p=moodle.git

MDL-15758 - fixing assignment & resource bugs
---

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index b65fba7af4..c1dae2afb4 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -3176,6 +3176,10 @@ class assignment_portfolio_caller extends portfolio_module_caller_base {
     }
 
     public function __wakeup() {
+        global $CFG;
+        if (empty($CFG)) {
+            return true; // too early yet
+        }
         require_once($this->assignmentfile);
         $this->assignment = unserialize(serialize($this->assignment));
     }
diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index ecaf5801c1..b5e8c93851 100644
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -718,6 +718,10 @@ class resource_portfolio_caller extends portfolio_module_caller_base {
     }
 
     public function __wakeup() {
+        global $CFG;
+        if (empty($CFG)) {
+            return; // too early yet
+        }
         require_once($this->resourcefile);
         $this->resource = unserialize(serialize($this->resource));
     }