Merge remote-tracking branch 'smiles/master' into MOODLE_42_STABLE

donhinkelman · Aug 15, 2024 · 5ffedbf · 5ffedbf
2 parents e13ccca + 1ad3c5a
commit 5ffedbf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/classes/output/block/content.php b/classes/output/block/content.php
@@ -36,7 +36,11 @@ private function export_items_for_template(): array
             'userid' => $USER->id,
             'classname' => "\\block_sharing_cart\\task\\asynchronous_backup_task",
             'timestarted' => null
-        ], fields: "id, JSON_EXTRACT(customdata, '$.item.id') as item_id");
+        ], fields: "id, customdata");
+        array_walk($not_running_backup_tasks, static function ($task) {
+            $task->item_id = json_decode($task->customdata)?->item?->id;
+            unset($task->customdata);
+        });
         $not_running_backup_tasks = array_combine(
             array_column($not_running_backup_tasks, 'item_id'),
             $not_running_backup_tasks

diff --git a/classes/output/block/item.php b/classes/output/block/item.php
@@ -90,7 +90,11 @@ public function export_for_template(\renderer_base $output): array
             'userid' => $USER->id,
             'classname' => "\\block_sharing_cart\\task\\asynchronous_backup_task",
             'timestarted' => null
-        ], fields: "id, JSON_EXTRACT(customdata, '$.item.id') as item_id");
+        ], fields: "id, customdata");
+        array_walk($not_running_backup_tasks, static function ($task) {
+            $task->item_id = json_decode($task->customdata)?->item?->id;
+            unset($task->customdata);
+        });
         $not_running_backup_tasks = array_combine(
             array_column($not_running_backup_tasks, 'item_id'),
             $not_running_backup_tasks

diff --git a/version.php b/version.php
@@ -6,7 +6,7 @@
 
 /** @var object $plugin */
 $plugin->component = 'block_sharing_cart';
-$plugin->version = 2024080800;
+$plugin->version = 2024080801;
 $plugin->requires = 2023042400; // Moodle 4.2.0
 $plugin->release = '5.0, release 1';
 $plugin->maturity = MATURITY_STABLE;