From 1a574627aaabcbb21a8ec2344f2f91a155e6c949 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sat, 22 Aug 2015 01:46:25 -0700 Subject: [PATCH] CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters. Fix dedupe_email_default conflict. For `dedupe_email_default`, the default values in `getItem()` and in `settings/` disagree. The default in `settings/` seems better IMHO. --- api/v3/Mailing.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php index a5f2df0e46..19d4c7b7f4 100755 --- a/api/v3/Mailing.php +++ b/api/v3/Mailing.php @@ -132,13 +132,9 @@ function _civicrm_api3_mailing_create_spec(&$params) { $params['created_id']['api.required'] = 1; $params['created_id']['api.default'] = 'user_contact_id'; - $params['override_verp']['api.default'] = !CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, - 'track_civimail_replies', NULL, FALSE - ); + $params['override_verp']['api.default'] = !CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, 'track_civimail_replies'); $params['visibility']['api.default'] = 'Public Pages'; - $params['dedupe_email']['api.default'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, - 'dedupe_email_default', NULL, FALSE - ); + $params['dedupe_email']['api.default'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, 'dedupe_email_default'); $params['forward_replies']['api.default'] = FALSE; $params['auto_responder']['api.default'] = FALSE; -- 2.25.1