From b5c4e7d85c3069551945ecfddd42b44cbb1defc8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 May 2012 19:14:39 +0200
Subject: Fix PHP warning on PHP 5.4 (#1488469)

---
 program/steps/addressbook/func.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'program/steps/addressbook/func.inc')

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;
-- 
cgit v1.2.3