Skip to content

Fix for CRM-15487 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunilpawar wants to merge 1 commit into
base: standalone
Choose a base branch
from
Open

Fix for CRM-15487 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CRM/Contact/BAO/Individual.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ static function format(&$params, &$contact) {
$value = $individual->$dbName;

// the db has name values
if ($value && CRM_Utils_Array::value('preserveDBName', $params)) {
if ($value && !empty($params['preserveDBName'])) {
$useDBNames[] = $name;
}
}

foreach (array('prefix', 'suffix') as $name) {
$dbName = "{$name}_id";
$value = $individual->$dbName;
if ($value && CRM_Utils_Array::value('preserveDBName', $params)) {
if ($value && !empty($params['preserveDBName'])) {
$useDBNames[] = $name;
}
}
Expand Down Expand Up @@ -143,7 +143,7 @@ static function format(&$params, &$contact) {
$params[$dbName] = $value;
$contact->$dbName = $value;
if ($value) {
$$name = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', $name, $value);
$$name = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', $dbName, $value);
}
else {
$$name = NULL;
Expand All @@ -156,7 +156,7 @@ static function format(&$params, &$contact) {
}
}
elseif ($value) {
$$name = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', $name, $value);
$$name = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', $dbName, $value);
}
}
}
Expand All @@ -182,7 +182,7 @@ static function format(&$params, &$contact) {
);
// make sure we have all the name fields.
foreach ($nameParams as $name => $value) {
if (!CRM_Utils_Array::value($name, $formatted) && $value) {
if (empty($formatted[$name]) && $value) {
$formatted[$name] = $value;
}
}
Expand Down