Merge branch 'MDL-64818_master' of git://github.com/gjb2048/moodle

2020-08-10 18:54:30 +08:00
parent e9d5a2b0a8 da4ded8a16
commit 7a6ea323e4
1 changed files with 4 additions and 3 deletions
@@ -1817,11 +1817,12 @@ class core_renderer extends renderer_base {
     */
    public function blocks_for_region($region) {
        $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
-        $blocks = $this->page->blocks->get_blocks_for_region($region);
        $lastblock = null;
        $zones = array();
-        foreach ($blocks as $block) {
-            $zones[] = $block->title;
+        foreach ($blockcontents as $bc) {
+            if ($bc instanceof block_contents) {
+                $zones[] = $bc->title;
+            }
        }
        $output = '';