extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

need to load all cfs for $ignore_acl=true

Browse Source
This commit is contained in:
Ralf Becker 2016-01-21 13:25:22 +00:00
parent a0f707eaea
commit 2a77e523f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.bo_merge.inc.php
View File

@ -206,9 +206,7 @@ abstract class bo_merge
if (!is_array($contact)) return array();
$replacements = array();
$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)
foreach(array_keys($this->contacts->contact_fields) as $name)
{
$value = $contact[$name];
switch($name)
@ -263,7 +261,8 @@ abstract class bo_merge
if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
}
// set custom fields, should probably go to a general method all apps can use
foreach($this->contacts->customfields as $name => $field)
// need to load all cfs for $ignore_acl=true
foreach($ignore_acl ? egw_customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
{
$name = '#'.$name;
$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =