Merge pull request #16457 from colemanw/api4doc

[civicrm-core.git] / api / v3 / Contact.php

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index cc98dcaf982d8dc5ff929470835a7a7cfd95e620..680583cf1e78bba3edd7d110f7595d03158714db 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -758,6 +758,10 @@ function civicrm_api3_contact_getquick($params) {
     if ($field_name == 'contact_id') {
       $field_name = 'id';
     }
+    // core#1420 : trim non-numeric character from phone search string
+    elseif ($field_name == 'phone_numeric') {
+      $name = preg_replace('/[^\d]/', '', $name);
+    }
     if (isset($table_names[$field_name])) {
       $table_name = $table_names[$field_name];
     }
@@ -1204,7 +1208,7 @@ function civicrm_api3_contact_get_merge_conflicts($params) {
   $migrationInfo = [];
   $result = [];
   foreach ((array) $params['mode'] as $mode) {
-    $result[$mode]['conflicts'] = CRM_Dedupe_Merger::getConflicts(
+    $result[$mode] = CRM_Dedupe_Merger::getConflicts(
       $migrationInfo,
       $params['to_remove_id'], $params['to_keep_id'],
       $mode