Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle

2011-05-09 02:04:34 +02:00
parent a8f60a4d58 faca4f2f29
commit 91a7cd842d
1 changed files with 1 additions and 1 deletions
@@ -541,7 +541,7 @@ class block_manager {
        list($pagetypepatterntest, $pagetypepatternparams) =
                $DB->get_in_or_equal($pagetypepatterns, SQL_PARAMS_NAMED, 'pagetypepatterntest');

-        list($ccselect, $ccjoin) = context_instance_preload_sql('b.id', CONTEXT_BLOCK, 'ctx');
+        list($ccselect, $ccjoin) = context_instance_preload_sql('bi.id', CONTEXT_BLOCK, 'ctx');

        $params = array(
            'subpage1' => $this->page->subpage,