- bugfix: didn't merged vCards on edit correctly

Christian Putzke · Christian Putzke · commit 2da2b5c0c1f2 · 2012-02-22T21:32:25.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v0.3 to v0.3.1
+- bugfix: didn't merged vCards on edit correctly
+
 changes from v0.2.5 to v0.3
 - added edit and delete functionality for CardDAV-Contacts
 - added sabreDAV support
diff --git a/README b/README
@@ -21,6 +21,12 @@ Planned Features
 * improved search for CardDAV-Contacts within the addressbook
 
 
+Requirements
+------------
+* SQL-Database
+* CURL
+
+
 Installation
 ------------
 * execute SQL-Statements from /plugins/carddav/SQL/mysql.sql
diff --git a/carddav.php b/carddav.php
@@ -18,7 +18,7 @@
  * @copyright Graviox Studios
  * @link http://www.graviox.de
  * @since 06.09.2011
- * @version 0.3
+ * @version 0.3.1
  * @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
  *
  */
diff --git a/carddav_addressbook.php b/carddav_addressbook.php
@@ -7,7 +7,7 @@
  * @copyright Graviox Studios
  * @since 12.09.2011
  * @link http://www.graviox.de
- * @version 0.3
+ * @version 0.3.1
  * @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
  *
  */
@@ -927,7 +927,9 @@ public function remove_from_group($group_id, $ids)
 	 */
 	public function update($carddav_contact_id, $save_data)
 	{
+		$record = $this->get_record($carddav_contact_id, true);
 		$database_column_contents = $this->get_database_column_contents($save_data, $record);
+
 		return $this->carddav_update($carddav_contact_id, $database_column_contents['vcard']);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* @copyright Graviox Studios`
`19`	`19`	`* @link http://www.graviox.de`
`20`	`20`	`* @since 06.09.2011`
`21`		`- * @version 0.3`
	`21`	`+ * @version 0.3.1`
`22`	`22`	`* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later`
`23`	`23`	`*`
`24`	`24`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* @copyright Graviox Studios`
`8`	`8`	`* @since 12.09.2011`
`9`	`9`	`* @link http://www.graviox.de`
`10`		`- * @version 0.3`
	`10`	`+ * @version 0.3.1`
`11`	`11`	`* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later`
`12`	`12`	`*`
`13`	`13`	`*/`
`@@ -927,7 +927,9 @@ public function remove_from_group($group_id, $ids)`
`927`	`927`	`*/`
`928`	`928`	`public function update($carddav_contact_id, $save_data)`
`929`	`929`	`{`
	`930`	`+ $record = $this->get_record($carddav_contact_id, true);`
`930`	`931`	`$database_column_contents = $this->get_database_column_contents($save_data, $record);`
	`932`	`+`
`931`	`933`	`return $this->carddav_update($carddav_contact_id, $database_column_contents['vcard']);`
`932`	`934`	`}`
`933`	`935`