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

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 1fc331b..4c816c2 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -557,6 +557,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,