Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…OODLE_20_STABLE
  • Loading branch information...
commit 07ca3c68163a6d9b1df4dbe5b7fe472e2df8d4aa 2 parents 385e9d7 + b8369f5
@stronk7 stronk7 authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 lib/blocklib.php
View
4 lib/blocklib.php
@@ -550,6 +550,10 @@ public function load_blocks($includeinvisible = null) {
'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,

0 comments on commit 07ca3c6

Please sign in to comment.
Something went wrong with that request. Please try again.