diff options
| author | Thomas Bruederli <bruederli@kolabsys.com> | 2012-05-12 16:47:51 +0200 |
|---|---|---|
| committer | Thomas Bruederli <bruederli@kolabsys.com> | 2012-05-12 16:47:51 +0200 |
| commit | 5c6d1ac5a25550515a20b74c1986045127a87265 (patch) | |
| tree | 46ccb174e481f842f2f18a5e9b27dd4cb2a435d7 /program/steps | |
| parent | 568e26c343e73d0d4e983342bf7b29bddb33715b (diff) | |
| parent | 02cf44e1838aca64e14921d30dc44d25a4d73b1c (diff) | |
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/addressbook/func.inc | 7 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index a31370b16..bd3819436 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; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index aeb917bd7..854298d8b 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1330,7 +1330,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, if ($addicon && $_SESSION['writeable_abook']) { $address = html::span(null, $address . html::a(array( 'href' => "#add", - 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)), + 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string), 'title' => rcube_label('addtoaddressbook'), 'class' => 'rcmaddcontact', ), |