Permalink
Browse files

Merge branch 'wip-MDL-27400-MOODLE_20_STABLE' of git://github.com/sam…

…hemelryk/moodle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 9784520 + 31a43cc commit 30dc7311adf2cb0380229190a8afee923bc4b076 @stronk7 stronk7 committed May 9, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/blocklib.php
View
@@ -541,7 +541,7 @@ public function load_blocks($includeinvisible = null) {
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,

0 comments on commit 30dc731

Please sign in to comment.