Fix DB error when creating a new contact and a group is selected (#1489051)

CHANGELOG

@@ -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)
 
 RELEASE 0.9.0

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;

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