summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-04 14:00:13 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-04 14:00:13 +0000
commit4df96779f81a8e299c21d1d0c8ff45677747d397 (patch)
treef1e38489b880244d13766c6530c1bbe076290a1d /roundcubemail/program
parenta1912799663c5bc2ce3c55fd3f95589404366679 (diff)
- Fix displaying form warnings on contact save
git-svn-id: https://svn.roundcube.net/trunk@5709 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/steps/addressbook/save.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/addressbook/save.inc b/roundcubemail/program/steps/addressbook/save.inc
index 03f6671e6..e93ce9918 100644
--- a/roundcubemail/program/steps/addressbook/save.inc
+++ b/roundcubemail/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;