summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-05 08:50:07 +0000
committeralecpl <alec@alec.pl>2012-01-05 08:50:07 +0000
commita33118fd0f0fa3765507b50bcb45cf44da1190bb (patch)
tree04ad1aa53b40c411051570d2bb9df2261bf78aed /program/steps
parent896b2204e85aafb7eece9e42a0fb4e3bf5a8551b (diff)
- Applied fixes from trunk up to r5711
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/addressbook/save.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 03f6671e6..e93ce9918 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -81,8 +81,8 @@ if (empty($a_record['name'])) {
// do input checks (delegated to $CONTACTS instance)
if (!$CONTACTS->validate($a_record)) {
- $err = (array)$CONTACTS->get_error() + array('message' => 'formincomplete', 'type' => 'warning');
- $OUTPUT->show_message($err['message'], $err['type']);
+ $err = (array)$CONTACTS->get_error();
+ $OUTPUT->show_message($err['message'] ? $err['message'] : 'formincomplete', 'warning');
$GLOBALS['EDIT_RECORD'] = $a_record; // store submitted data to be used in edit form
rcmail_overwrite_action($return_action);
return;