Merge pull request #29 from catalyst/small-fixes

Small fixes to help with prior backup restores
catalyst · Sep 28, 2021 · f14204d · f14204d
2 parents 5842a99 + f32e619
commit f14204d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/block_carousel.php b/block_carousel.php
@@ -135,6 +135,9 @@ public function get_content() {
 
         $numslides = count($order);
         foreach ($data as $slideid => $data) {
+            if (empty($data)) {
+                continue;
+            }
             $data = (object) $data;
             if ($data->disabled) {
                 continue;

diff --git a/classes/cache/slide_cache.php b/classes/cache/slide_cache.php
@@ -87,7 +87,12 @@ public function load_for_cache($key) {
         $data['text'] = $data['notext'] ? '' : $data['text'];
 
         // Find the relevant content for the slide.
-        $context = \context_block::instance($record->blockid);
+        try {
+            $context = \context_block::instance($record->blockid);
+        } catch (\dml_missing_record_exception $e) {
+            return [];
+        }
+
         $selectedfile = null;
         $storage = get_file_storage();