From fdb47ab16855f72ceeb58db124007856e57448c9 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 26 Oct 2017 09:16:02 +0200
Subject: [PATCH] Merge calendar events into user account if there is one over
 user contact

---
 api/src/Contacts.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index 9b87c5229d..5093291ac8 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -1929,7 +1929,7 @@ class Contacts extends Contacts\Storage
 				}
 			}
 			// Update calendar
-			$this->merge_calendar($contact['id'], $target['id']);
+			$this->merge_calendar('c'.$contact['id'], $target['account_id'] ? 'u'.$target['account_id'] : 'c'.$target['id']);
 
 			if ($this->delete($contact['id'])) $success++;
 		}
@@ -1952,12 +1952,12 @@ class Contacts extends Contacts\Storage
 		}
 
 		// Find all events with this contact
-		$events = $bo->search(array('users' => "c$old_id", 'ignore_acl' => true));
+		$events = $bo->search(array('users' => $old_id, 'ignore_acl' => true));
 
 		foreach($events as $event)
 		{
-			$event['participants']["c$new_id"] = $event['participants']["c$old_id"];
-			unset($event['participants']["c$old_id"]);
+			$event['participants'][$new_id] = $event['participants'][$old_id];
+			unset($event['participants'][$old_id]);
 
 			// Quietly update, ignoring ACL & no notifications
 			$bo->update($event, true, true, true, true, $messages, true);