[Svn] r5709 - trunk/roundcubemail/program/steps/addressbook

[trac at roundcube.net]

Author: alec
Date: 2012-01-04 08:00:13 -0600 (Wed, 04 Jan 2012)
New Revision: 5709

Modified:
   trunk/roundcubemail/program/steps/addressbook/save.inc
Log:
- Fix displaying form warnings on contact save


Modified: trunk/roundcubemail/program/steps/addressbook/save.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/save.inc	2012-01-04 13:32:14 UTC (rev 5708)
+++ trunk/roundcubemail/program/steps/addressbook/save.inc	2012-01-04 14:00:13 UTC (rev 5709)
@@ -81,8 +81,8 @@
 
 // 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;

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn