From 879e4400c297872d332fbe5bb0999d9a0abb36b5 Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Thu, 24 Oct 2013 14:45:39 +0530
Subject: [PATCH] code cleanup CRM-13327

----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
  http://issues.civicrm.org/jira/browse/CRM-13327
---
 CRM/Badge/BAO/Layout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Badge/BAO/Layout.php b/CRM/Badge/BAO/Layout.php
index 7b51e3c681..db173d7096 100644
--- a/CRM/Badge/BAO/Layout.php
+++ b/CRM/Badge/BAO/Layout.php
@@ -166,7 +166,7 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel {
     CRM_Badge_BAO_Layout::retrieve($layoutParams, $layoutInfo);
 
     $formatProperties = CRM_Core_OptionGroup::getValue('name_badge', $layoutInfo['label_format_name'], 'name');
-    $layoutInfo['format'] = get_object_vars(json_decode($formatProperties));
+    $layoutInfo['format'] = json_decode($formatProperties, true);
     $layoutInfo['data'] = CRM_Badge_BAO_Layout::getDecodedData($layoutInfo['data']);
     return $layoutInfo;
   }
-- 
2.25.1