CRM-19200 Merging just the title (prefix) field doesn't update the record properly

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 858ad46a4ea2abeeb1c3fe4680157750823344ff..a67cfecffbdaf1d3cc29547e1cf7f69d5b70f972 100644 (file)
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -520,7 +520,7 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
    * @param array $params
    */
   public static function addBillingNameFieldsIfOtherwiseNotSet(&$params) {
-    $nameFields = array('first_name', 'middle_name', 'last_name');
+    $nameFields = array('first_name', 'middle_name', 'last_name', 'nick_name', 'prefix_id', 'suffix_id');
     foreach ($nameFields as $field) {
       if (!empty($params[$field])) {
         return;