From: Tim Otten <totten@civicrm.org>
Date: Sat, 28 Feb 2015 00:18:27 +0000 (-0700)
Subject: CRM-15854 - Fix crash on review form
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=385f11fd1670ae04f051352486e1cae0044fb97e;p=civicrm-core.git

CRM-15854 - Fix crash on review form
---

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index f3e16c33c2..1bf6a2f24d 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -881,7 +881,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
     $attributes = $attributes ? $attributes : array();
     $allowClear = !empty($attributes['allowClear']);
     unset($attributes['allowClear']);
-    $attributes += array('id_suffix' => $name);
+    $attributes['id_suffix'] = $name;
     foreach ($values as $key => $var) {
       $options[] = $this->createElement('radio', NULL, NULL, $var, $key, $attributes);
     }
diff --git a/CRM/Mailing/Form/Approve.php b/CRM/Mailing/Form/Approve.php
index 8771bb0ef6..684cee77dc 100644
--- a/CRM/Mailing/Form/Approve.php
+++ b/CRM/Mailing/Form/Approve.php
@@ -119,7 +119,7 @@ class CRM_Mailing_Form_Approve extends CRM_Core_Form {
       unset($mailApprovalStatus[$noneOptionID]);
     }
 
-    $this->addRadio('approval_status_id', ts('Approval Status'), $mailApprovalStatus, TRUE, NULL, TRUE);
+    $this->addRadio('approval_status_id', ts('Approval Status'), $mailApprovalStatus, array(), NULL, TRUE);
 
     $buttons = array(
       array(