From 600dcdfc583ab671fc61ff957ad7fd1a3a0c547d Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 12 Dec 2020 10:10:32 +0100 Subject: Remove duplicate delete terms query --- include/items.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index bcdc6c687..956b259af 100755 --- a/include/items.php +++ b/include/items.php @@ -4072,11 +4072,6 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL) { if($stage == DROPITEM_PHASE1) return true; - $r = q("delete from term where otype = %d and oid = %d", - intval(TERM_OBJ_POST), - intval($item['id']) - ); - q("delete from iconfig where iid = %d", intval($item['id']) ); -- cgit v1.2.3 From 6579007ca080a7d126be0c3130043f754eb6ac2e Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 19 Dec 2020 23:57:14 +0100 Subject: Fix CardDAV address book ID --- include/import.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/import.php b/include/import.php index cfbb8775d..d02cc1e1f 100644 --- a/include/import.php +++ b/include/import.php @@ -1554,6 +1554,7 @@ function sync_addressbook($channel, $data) { $id = get_cdav_id($principalUri, $data['uri'], 'addressbooks'); if(! $id) return; + $id = $id['id']; } $pdo = \DBA::$dba->db; -- cgit v1.2.3