Merge branch 'MDL-26618_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

2011-07-05 17:48:30 +02:00
parent 385e9d72ec b8369f5e9f
commit 07ca3c6816
1 changed files with 4 additions and 0 deletions
@@ -550,6 +550,10 @@ class block_manager {
            'contextid2' => $context->id,
            'pagetype' => $this->page->pagetype,
        );
+        if ($this->page->subpage === '') {
+            $params['subpage1'] = $DB->sql_empty();
+            $params['subpage2'] = $DB->sql_empty();
+        }
        $sql = "SELECT
                    bi.id,
                    bp.id AS blockpositionid,