From 114ff5fa92abc862cfa33cd3a0828ed398672a5b Mon Sep 17 00:00:00 2001
From: Alexander Van der Bellen <alexandervanderbellen@catalyst-au.net>
Date: Sun, 8 Sep 2024 23:05:54 +0800
Subject: [PATCH] MDL-83044 core_block: Add return value check on form
 submission

---
 blocks/edit_form.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/blocks/edit_form.php b/blocks/edit_form.php
index 5dfec207253..61bdc5a2732 100644
--- a/blocks/edit_form.php
+++ b/blocks/edit_form.php
@@ -441,6 +441,11 @@ class block_edit_form extends \core_form\dynamic_form {
             $blockregion = $this->optional_param('blockregion', null, PARAM_TEXT);
             $newblock = $this->page->blocks->add_block_at_end_of_default_region($this->block->name(),
                 empty($blockregion) ? null : $blockregion);
+
+            if (empty($newblock)) {
+                return;
+            }
+
             $this->page->blocks->load_blocks();
             $newblock = $this->page->blocks->find_instance($newblock->instance->id);
             $newdata = $this->prepare_defaults($newblock->instance);