From: Eileen McNaughton Date: Tue, 22 Apr 2014 00:06:33 +0000 (+1200) Subject: remove trailing whitespace X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=69739cb8722102caecb13721e742b9961a699b58;p=civicrm-core.git remove trailing whitespace --- diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index f0dce17514..82f9f74d48 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -2079,7 +2079,7 @@ ORDER BY civicrm_email.is_primary DESC"; if (($session->get('authSrc') & (CRM_Core_Permission::AUTH_SRC_CHECKSUM + CRM_Core_Permission::AUTH_SRC_LOGIN)) == 0 && ($value == '' || !isset($value))) { continue; - } + } $valueId = NULL; if (CRM_Utils_Array::value('customRecordValues', $params)) { @@ -2136,21 +2136,21 @@ ORDER BY civicrm_email.is_primary DESC"; } } } - else if (in_array($key, - array('nick_name', - 'job_title', - 'middle_name', - 'birth_date', + else if (in_array($key, + array('nick_name', + 'job_title', + 'middle_name', + 'birth_date', 'gender_id', - 'current_employer', - 'prefix_id', + 'current_employer', + 'prefix_id', 'suffix_id')) && ($value == '' || !isset($value)) && ($session->get('authSrc') & (CRM_Core_Permission::AUTH_SRC_CHECKSUM + CRM_Core_Permission::AUTH_SRC_LOGIN)) == 0) { - // CRM-10128: if auth source is not checksum / login && $value is blank, do not fill $data with empty value + // CRM-10128: if auth source is not checksum / login && $value is blank, do not fill $data with empty value // to avoid update with empty values continue; - } + } else { $data[$key] = $value; }