From a15c0aa218fabd2de93e962dc7c697c4bf7ce72f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 31 May 2012 09:26:48 -0400
Subject: [PATCH] Add some padding to iframe footer
---
program/include/rcube_contacts.php | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 1a4950d..3e30043 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -254,13 +254,6 @@
$sql_arr['email'] = array_map('trim', $sql_arr['email']);
}
- // make sure we have a name to display
- if (empty($sql_arr['name'])) {
- if (empty($sql_arr['email']))
- $sql_arr['email'] = $this->get_col_values('email', $sql_arr, true);
- $sql_arr['name'] = $sql_arr['email'][0];
- }
-
$this->result->add($sql_arr);
}
@@ -890,7 +883,7 @@
* @param string New name to set for this group
* @return boolean New name on success, false if no data was changed
*/
- function rename_group($gid, $newname)
+ function rename_group($gid, $newname, &$new_gid)
{
// make sure we have a unique name
$name = $this->unique_groupname($newname);
@@ -944,7 +937,9 @@
$contact_id
);
- if (!$this->db->db_error)
+ if ($this->db->db_error)
+ $this->set_error(self::ERROR_SAVING, $this->db->db_error_msg);
+ else
$added++;
}
--
Gitblit v1.9.1