From: defacer <defacer>
Date: Sat, 5 Feb 2005 01:32:15 +0000 (+0000)
Subject: Fixing a serious bug with PHP 5 only, which caused blocks to lose
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=673c1b2f131b2a0e0e6757f17cd3e0a7ea6c48bf;p=moodle.git

Fixing a serious bug with PHP 5 only, which caused blocks to lose
their configuration data (there is an explanation but I don't think
anyone cares).

Actually it was an optimization and I had to disable it. All is fine now.
---

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index f0dab688e3..76b799a040 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -461,7 +461,11 @@ class block_base {
         if (!empty($instance->configdata)) {
             $this->config = unserialize(base64_decode($instance->configdata));
         }
-        unset($instance->configdata);
+        // [pj] This line below is supposed to be an optimization (we don't need configdata anymore)
+        // but what it does is break in PHP5 because the same instance object will be passed to
+        // this function twice in each page view, and the second time it won't have any configdata
+        // so it won't work correctly. Thus it's commented out.
+        // unset($instance->configdata);
         $this->instance = $instance;
         $this->specialization();
     }