diff options
| author | thomascube <thomas@roundcube.net> | 2011-10-30 16:33:09 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-10-30 16:33:09 +0000 |
| commit | 3ac5cdb4acc4b82c0b306df4e64081a7f7e4213d (patch) | |
| tree | 5c437d5e7e79301551fd080fb63be18fb599ccf8 /program/steps/addressbook | |
| parent | 2429cfde7887d1c92369cba972305a7f9ddddb18 (diff) | |
Also merge properties of child cols of composite address book fields + remove undefined fields from template
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/func.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 2082dbd1f..2b06e62cd 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -140,8 +140,13 @@ function rcmail_contact_source($source=null, $init_env=false, $writable=false) $CONTACT_COLTYPES = array_intersect_key($CONTACT_COLTYPES, $contact_cols); // add associative coltypes definition if (!$CONTACTS->coltypes[0]) { - foreach ($CONTACTS->coltypes as $col => $colprop) + foreach ($CONTACTS->coltypes as $col => $colprop) { + if (is_array($colprop['childs'])) { + foreach ($colprop['childs'] as $childcol => $childprop) + $colprop['childs'][$childcol] = array_merge((array)$CONTACT_COLTYPES[$col]['childs'][$childcol], $childprop); + } $CONTACT_COLTYPES[$col] = $CONTACT_COLTYPES[$col] ? array_merge($CONTACT_COLTYPES[$col], $colprop) : $colprop; + } } } @@ -597,7 +602,7 @@ function rcmail_contact_form($form, $record, $attrib = null) $coltypes[$field] += (array)$colprop; $coltypes[$field]['count']++; - $val = strtr($template, $composite); + $val = preg_replace('/\{\w+\}/', '', strtr($template, $composite)); } else if ($edit_mode) { // call callback to render/format value |