From 2595f62573b3b88288376e3aec96895589e2324e Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 8 Mar 2010 11:14:49 +0000 Subject: [PATCH] changing the condition for n_fn adaption. change of given name and family name seems not to be sufficient --- addressbook/inc/class.addressbook_ui.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index dcbe4a4212..33f853ad7c 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1223,13 +1223,13 @@ class addressbook_ui extends addressbook_bo { $links = $content['link_to']['to_id']; } + $fullname = $old_fullname = parent::fullname($content); if ($content['id'] && $content['org_name'] && $content['change_org']) { $old_org_entry = $this->read($content['id']); + $old_fullname = ($old_org_entry['n_fn'] ? $old_org_entry['n_fn'] : parent::fullname($old_org_entry)); } - if (isset($content['n_family']) && isset($content['n_given']) - && $content['n_family'] != $old_org_entry['n_family'] - && $content['n_given'] != $old_org_entry['n_given']) + if ( $content['n_fn'] != $fullname || $fullname != $old_fullname) { unset($content['n_fn']); }