R29328 - /branches/1.6/addressbook/inc/class.addressbook_bo.inc.php

Old eGW-svn
1

Author: leithoff
New Revision: 29328

URL: http://www.egroupware.org/viewvc/egroupware?rev=29328&view=rev
Log:
backport of rev27514+rev27703 from trunk to fix “n_fn not updated anymore”-issue

Modified:
branches/1.6/addressbook/inc/class.addressbook_bo.inc.php

Modified: branches/1.6/addressbook/inc/class.addressbook_bo.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/addressbook/inc/class.addressbook_bo.inc.php?rev=29328&r1=29327&r2=29328&view=diff

— branches/1.6/addressbook/inc/class.addressbook_bo.inc.php (original)
+++ branches/1.6/addressbook/inc/class.addressbook_bo.inc.php Fri Feb 26 12:47:17 2010
@@ -726,11 +726,11 @@
$contact[‘modifier’] = $this->user;
$contact[‘modified’] = $this->now_su;
// set full name and fileas from the content

  •   if (!isset($contact['n_fn']))

  •   {

  •   	$contact['n_fn'] = $this->fullname($contact);

  •   if (strlen($fullname = $this->fullname($contact)) > 0 && (!isset($contact['n_fn']) || $contact['n_fn'] != $fullname)) {

  •   	$contact['n_fn'] = $fullname;
  	if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
  }

  •   unset($fullname);
  $to_write = $contact;
  // (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
  if (!$ignore_acl && !$contact['owner'] && !$this->is_admin($contact))

Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs