Better removal of admin settings and navigation blocks to prevent JS …

…'settingsblock.js' error on the console when it can't find the instanceid in the init method.
Wunderbyte-GmbH · Jun 30, 2023 · 153bd38 · 153bd38
1 parent 01e2e25
commit 153bd38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
@@ -606,10 +606,6 @@ public function blocks_for_region($region, $fakeblocksonly = false) {
         $numblocks = 1; // Take into account the fake flat navigation block.
         foreach ($blockcontents as $bc) {
             if ($bc instanceof block_contents) {
-                if (($bc->attributes['data-block'] == 'navigation') || ($bc->attributes['data-block'] == 'settings')) {
-                    continue;
-                }
-
                 $numblocks++;
             } else if ($bc instanceof block_move_target) {
                 $numblocks++;
@@ -676,11 +672,8 @@ public function blocks_for_region($region, $fakeblocksonly = false) {
         // One block column.
         foreach ($blockcontents as $bc) {
             if ($bc instanceof block_contents) {
-                if (($bc->attributes['data-block'] == 'navigation') || ($bc->attributes['data-block'] == 'settings')) {
-                    continue;
-                }
-
                 $thisblock = $this->block($bc, $region);
+                // TODO: Not sure if this is needed anymore?
                 if ($bc->attributes['data-block'] == 'adminblock') {
                     $bc->blockinstanceid = -1;
                     $thisblock->blockinstanceid = $bc->blockinstanceid;
@@ -711,12 +704,10 @@ public function blocks_for_region($region, $fakeblocksonly = false) {
                     $block->name = 'block_' . $block->attributes['data-block'];
                 }
                 $block->shape = 'squared';
+                // TODO: Not sure if this is needed anymore?
                 if ($block->name == "block_adminblock") {
                     $block->blockinstanceid = -1;
                 }
-                if ($block->name == "block_settings") {
-                    $block->subopen = true;
-                }
 
                 if ($count == 2) {
                     $pair->blockb = $block;

diff --git a/config.php b/config.php
@@ -154,3 +154,4 @@
 
 $THEME->iconsystem = '\\theme_squared\\output\\icon_system_fontawesome';
 $THEME->haseditswitch = true;
+$THEME->requiredblocks = '';