summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-05-10 19:14:39 +0200
committerAleksander Machniak <alec@alec.pl>2012-05-10 19:14:39 +0200
commitb5c4e7d85c3069551945ecfddd42b44cbb1defc8 (patch)
treeb24c62d3b30755d96f8d678d0c71951be1d89c8f
parent610b6a3b5d7617f8a3b7a5c8239eeb1090fc4ec6 (diff)
Fix PHP warning on PHP 5.4 (#1488469)
-rw-r--r--program/steps/addressbook/func.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index e52da3936..f79cac081 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -593,7 +593,12 @@ function rcmail_contact_form($form, $record, $attrib = null)
$composite = array(); $j = 0;
$template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
foreach ($colprop['childs'] as $childcol => $cp) {
- $childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
+ if (!empty($val) && is_array($val)) {
+ $childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
+ }
+ else {
+ $childvalue = '';
+ }
if ($edit_mode) {
if ($colprop['subtypes'] || $colprop['limit'] != 1) $cp['array'] = true;