From 1e36b718387359a9eb37bddb621c22b90e915d88 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 27 Jul 2011 06:52:38 -0400
Subject: [PATCH] - Generate display name before record validation
---
program/steps/addressbook/save.inc | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index ef1b9f9..d5d4537 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -136,6 +136,13 @@
}
}
+// Generate contact's display name (must be before validation)
+if (empty($a_record['name'])) {
+ $a_record['name'] = rcube_addressbook::compose_display_name($a_record, true);
+ // Reset it if equals to email address (from compose_display_name())
+ if ($a_record['name'] == $a_record['email'][0])
+ $a_record['name'] = '';
+}
// do input checks (delegated to $CONTACTS instance)
if (!$CONTACTS->validate($a_record)) {
@@ -162,14 +169,6 @@
// cleanup session data
$RCMAIL->plugins->exec_hook('attachments_cleanup', array('group' => 'contact'));
$RCMAIL->session->remove('contacts');
-}
-
-// Generate contact's display name
-if (empty($a_record['name'])) {
- $a_record['name'] = rcube_addressbook::compose_display_name($a_record, true);
- // Reset it if equals to email address (from compose_display_name())
- if ($a_record['name'] == $a_record['email'][0])
- $a_record['name'] = '';
}
--
Gitblit v1.9.1