From a0f707eaeae779366eb88363d0ad641338f3c8aa Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 21 Jan 2016 13:21:55 +0000 Subject: [PATCH] need to use private cfs too for $ignore_acl=true --- etemplate/inc/class.bo_merge.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 0e10ef195a..c1d048d1b9 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -206,7 +206,9 @@ abstract class bo_merge if (!is_array($contact)) return array(); $replacements = array(); - foreach(array_keys($this->contacts->contact_fields) as $name) + $fields = $this->contacts->contact_fields; + if ($ignore_acl) $fields = array_unique(array_merge($fields, array_keys(egw_customfields::get('addressbook', true)))); + foreach($fields as $name) { $value = $contact[$name]; switch($name)