Merge pull request #7047 from johanv/CRM-17430-dont_change_domain_version_1st_attempt

[civicrm-core.git] / CRM / Contact / Form / Task / EmailCommon.php

diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index 0f64c32a06a6404e1d111e8eee0663d47171ea88..296e7dd2b5bb400b6805fba6c2ecd413c64e749e 100644 (file)
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  */
 
 /**
@@ -524,7 +524,7 @@ class CRM_Contact_Form_Task_EmailCommon {
         $followupActivity = CRM_Activity_BAO_Activity::createFollowupActivity($activityId, $params);
         $followupStatus = ts('A followup activity has been scheduled.');
 
-        if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'activity_assignee_notification')) {
+        if (Civi::settings()->get('activity_assignee_notification')) {
           if ($followupActivity) {
             $mailToFollowupContacts = array();
             $assignee = array($followupActivity->id);