From 6f2c4a24f6d4b55ea569ecf552c97b8e35415064 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 17 Oct 2019 12:09:36 +1300 Subject: [PATCH] Fix default mode on Contact.merge api I believe this was a change I made in error & only the Contact.get_merge_conflicts api should receive an array for 'mode'. The mode is part of a loop within that api --- api/v3/Contact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v3/Contact.php b/api/v3/Contact.php index bcaa9954cc..200605bdc8 100644 --- a/api/v3/Contact.php +++ b/api/v3/Contact.php @@ -1195,7 +1195,7 @@ function _civicrm_api3_contact_merge_spec(&$params) { $params['mode'] = [ 'title' => ts('Dedupe mode'), 'description' => ts("In 'safe' mode conflicts will result in no merge. In 'aggressive' mode the merge will still proceed (hook dependent)"), - 'api.default' => ['safe', 'aggressive'], + 'api.default' => 'safe', 'options' => ['safe' => ts('Abort on unhandled conflict'), 'aggressive' => ts('Proceed on unhandled conflict. Note hooks may change handling here.')], ]; } -- 2.25.1