Merge branch 'MDL-59629-master' of git://github.com/peterRd/moodle

This commit is contained in:
Jun Pataleta 2018-12-17 15:57:52 +08:00
commit 6776651372

View file

@ -519,6 +519,11 @@ class block_manager {
} }
} }
$this->regions[$region] = 1; $this->regions[$region] = 1;
// Checking the actual property instead of calling get_default_region as it ends up in a recursive call.
if (empty($this->defaultregion)) {
$this->set_default_region($region);
}
} }
/** /**