From a2c895cb64eb7a016b8fbc753a71260a8003394b Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 22 Feb 2021 14:59:03 -0800 Subject: [PATCH] (dev/core#2404) afform_core - If "permission" is empty-string, then use default --- ext/afform/core/CRM/Afform/AfformScanner.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php index 97908d4932..d3b0f07702 100644 --- a/ext/afform/core/CRM/Afform/AfformScanner.php +++ b/ext/afform/core/CRM/Afform/AfformScanner.php @@ -139,7 +139,12 @@ class CRM_Afform_AfformScanner { $metaFile = $this->findFilePath($name, self::METADATA_FILE); if ($metaFile !== NULL) { - return array_merge($defaults, json_decode(file_get_contents($metaFile), 1)); + $r = array_merge($defaults, json_decode(file_get_contents($metaFile), 1)); + // Previous revisions of GUI allowed permission==''. array_merge() doesn't catch all forms of missing-ness. + if ($r['permission'] === '') { + $r['permission'] = $defaults['permission']; + } + return $r; } elseif ($this->findFilePath($name, self::LAYOUT_FILE)) { return $defaults; -- 2.25.1