* Addressbook - Merging contacts now keeps all distribution lists

2017-09-26 11:05:19 -06:00 · 2017-09-26 11:05:19 -06:00 · 37f45855a9
commit 37f45855a9
parent 5774524360
1 changed files with 7 additions and 0 deletions
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@ -1879,6 +1879,13 @@ class Contacts extends Contacts\Storage
 						break;
 				}
 			}
+
+			// Merge distribution lists
+			$lists = $this->read_distributionlist(array($contact['id']));
+			foreach($lists as $list_id => $list_name)
+			{
+				parent::add2list($target['id'], $list_id);
+			}
 		}
 		if (!$this->save($target)) return 0;