Merge pull request #3346 from eileenmcnaughton/comments

[civicrm-core.git] / CRM / Activity / Form / ActivityView.php

diff --git a/CRM/Activity/Form/ActivityView.php b/CRM/Activity/Form/ActivityView.php
index 9904b737d25880ddd4eb2944f3856da2abeebe62..aef4662d17e784d107d6cf2f1b181dc1d16de85e 100644 (file)
--- a/CRM/Activity/Form/ActivityView.php
+++ b/CRM/Activity/Form/ActivityView.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -78,7 +78,7 @@ class CRM_Activity_Form_ActivityView extends CRM_Core_Form {
     $this->assign('activityTypeName', $activityTypeName);
     $this->assign('activityTypeDescription', $activityTypeDescription);
 
-    if (CRM_Utils_Array::value('mailingId', $defaults)) {
+    if (!empty($defaults['mailingId'])) {
       $this->_mailing_id = CRM_Utils_Array::value('source_record_id', $defaults);
       $mailingReport = CRM_Mailing_BAO_Mailing::report($this->_mailing_id, TRUE);
       CRM_Mailing_BAO_Mailing::getMailingContent($mailingReport, $this);
@@ -121,7 +121,7 @@ class CRM_Activity_Form_ActivityView extends CRM_Core_Form {
   public function buildQuickForm() {
     $this->addButtons(array(
         array(
-          'type' => 'next',
+          'type' => 'cancel',
           'name' => ts('Done'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,