Merge branch 'MDL-59629-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE

2018-12-17 15:56:04 +08:00
parent 9d8470e4b8 bb13181338
commit 5156ced934
1 changed files with 5 additions and 0 deletions
@@ -519,6 +519,11 @@ class block_manager {
            }
        }
        $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);
+        }
    }

    /**