From 468b0e00eae12d323e0de3c3dfb9ee8200e321b3 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 6 Apr 2022 18:21:02 -0400 Subject: [PATCH] Afform - Ensure upgrade fully converts content blocks Ensures `{block: '*'}` doesn't get converted to `{entity_type: '*'}` because that's not a real entity type. --- ext/afform/core/CRM/Afform/Upgrader.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/afform/core/CRM/Afform/Upgrader.php b/ext/afform/core/CRM/Afform/Upgrader.php index ccac7fc550..d104d03f28 100644 --- a/ext/afform/core/CRM/Afform/Upgrader.php +++ b/ext/afform/core/CRM/Afform/Upgrader.php @@ -55,6 +55,9 @@ class CRM_Afform_Upgrader extends CRM_Afform_Upgrader_Base { } if (!empty($meta['entity_type'])) { $meta['type'] = 'block'; + if ($meta['entity_type'] === '*') { + unset($meta['entity_type']); + } } file_put_contents($fileName, json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); } -- 2.25.1