diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-04-19 08:35:08 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-04-19 08:35:08 +0200 |
| commit | 7652687692bffdc31a1b65ed4afce97addd2bbde (patch) | |
| tree | 47a793d3373689d57acd190b868aaedea05b1c41 | |
| parent | ca2c6316fb1bd6b092df9ca323152f1050ee2d56 (diff) | |
Fix DB error when creating a new contact and a group is selected (#1489051)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_contacts.php | 4 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 2 |
3 files changed, 2 insertions, 5 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix DB error when creating a new contact and a group is selected (#1489051) - Fix handling of deprecated boolean value of reply_mode option (#1489052) - Fix parsing invalid date string (#1489035) - Add "with attachment" option to messages list filter (#1485382) diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index c66e98687..e4fd7dc10 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -626,10 +626,6 @@ class rcube_contacts extends rcube_addressbook $insert_id = $this->db->insert_id($this->db_name); } - // also add the newly created contact to the active group - if ($insert_id && $this->group_id) - $this->add_to_group($this->group_id, $insert_id); - $this->cache = null; return $insert_id; diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 8cab6e817..25bfbd48b 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -192,7 +192,7 @@ else { if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum)) $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum)); - $CONTACTS->add_to_group($gid, $plugin['ids']); + $CONTACTS->add_to_group($plugin['group_id'], $plugin['ids']); } } else |