From e33fd91165955a1d47fe5b44940d9fe6cd3ecf44 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 8 Oct 2022 11:28:35 +0100
Subject: [PATCH] dev/core#3829 Fix semi-recent regression on event badge

---
 CRM/Badge/Form/Layout.php            | 10 +++++-----
 xml/templates/civicrm_navigation.tpl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 4cde2b0baf..90026c7fe3 100644
--- a/CRM/Badge/Form/Layout.php
+++ b/CRM/Badge/Form/Layout.php
@@ -25,12 +25,12 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     if ($this->_action & CRM_Core_Action::DELETE) {
-      return parent::buildQuickForm();
+      parent::buildQuickForm();
+      return;
     }
 
-    $config = CRM_Core_Config::singleton();
     $resources = CRM_Core_Resources::singleton();
     $resources->addSetting(
       [
@@ -140,8 +140,8 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
    */
   public function setDefaultValues() {
     if (isset($this->_id)) {
-      $defaults = array_merge($this->_values,
-        CRM_Badge_BAO_Layout::getDecodedData(CRM_Utils_Array::value('data', $this->_values, '[]')));
+      $data = empty($this->_values['data']) ? '{}' : $this->_values['data'];
+      $defaults = array_merge($this->_values, json_decode($data, TRUE));
     }
     else {
       for ($i = 1; $i <= self::FIELD_ROWCOUNT; $i++) {
diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl
index cd6fe266ae..5cc596a1eb 100644
--- a/xml/templates/civicrm_navigation.tpl
+++ b/xml/templates/civicrm_navigation.tpl
@@ -34,7 +34,7 @@ INSERT INTO `civicrm_dashboard`
 -- event badge
 INSERT INTO civicrm_print_label (title, name, description, label_format_name, label_type_id, is_default, is_reserved, is_active, data)
 VALUES
-('Annual Conference Hanging Badge (Avery 5395)', 'Annual_Conference_Hanging_Badge', 'For our annual conference', 'Avery 5395', 1, 1, 1, 1, '{literal}{"title":"Annual Conference Hanging Badge (Avery 5395)","label_format_name":"Avery 5395","description":"For our annual conference","token":{"1":"{event.title}","2":"{contact.display_name}","3":"{contact.current_employer}","4":"{event.start_date|crmDate:\"%B %E%f\"}"},"font_name":{"1":"dejavusans","2":"dejavusans","3":"dejavusans","4":"dejavusans"},"font_size":{"1":"9","2":"20","3":"15","4":"9"},"font_style":{"1":"","2":"","3":"","4":""},"text_alignment":{"1":"L","2":"C","3":"C","4":"R"},"barcode_type":"barcode","barcode_alignment":"R","image_1":"","image_2":"","is_default":"1","is_active":"1","is_reserved":"1","_qf_default":"Layout:next","_qf_Layout_refresh":"Save and Preview"}{/literal}');
+('Annual Conference Hanging Badge (Avery 5395)', 'Annual_Conference_Hanging_Badge', 'For our annual conference', 'Avery 5395', 1, 1, 1, 1, '{literal}{"title":"Annual Conference Hanging Badge (Avery 5395)","label_format_name":"Avery 5395","description":"For our annual conference","token":{"1":"{event.title}","2":"{contact.display_name}","3":"{contact.current_employer}","4":"{event.start_date|crmDate:\\\"%B %E%f\\\"}"},"font_name":{"1":"dejavusans","2":"dejavusans","3":"dejavusans","4":"dejavusans"},"font_size":{"1":"9","2":"20","3":"15","4":"9"},"font_style":{"1":"","2":"","3":"","4":""},"text_alignment":{"1":"L","2":"C","3":"C","4":"R"},"barcode_type":"barcode","barcode_alignment":"R","image_1":"","image_2":"","is_default":"1","is_active":"1","is_reserved":"1","_qf_default":"Layout:next","_qf_Layout_refresh":"Save and Preview"}{/literal}');
 
 -- navigation
 
-- 
2.25.1