MDL-21655 big scary enrolment and roles improvements - see tacker for list of changes, includes other minor fixes too

2010-03-31 07:41:31 +00:00
parent d1d4813ff2
commit 4f0c2d0009
225 changed files with 2941 additions and 3097 deletions
@@ -555,11 +555,7 @@ class block_base {
            $this->config = unserialize(base64_decode($instance->configdata));
        }
        $this->instance = $instance;
-        if (isset($instance->context)) {
-            $this->context = $instance->context;
-        } else {
-            $this->context = get_context_instance(CONTEXT_BLOCK, $instance->id);
-        }
+        $this->context = get_context_instance(CONTEXT_BLOCK, $instance->id);
        $this->page = $page;
        $this->specialization();
        $this->get_required_javascript();