Merge pull request #2463 from annando/1604-diaspora-again

Some small Diaspora changes
This commit is contained in:
Tobias Diekershoff 2016-04-19 21:35:33 +02:00
commit f7548b87c6
1 changed files with 5 additions and 1 deletions

View File

@ -1000,6 +1000,9 @@ class diaspora {
* @return bool Success
*/
private function receive_account_deletion($importer, $data) {
/// @todo Account deletion should remove the contact from the global contacts as well
$author = notags(unxmlify($data->author));
$contact = self::contact_by_handle($importer["uid"], $author);
@ -2115,10 +2118,11 @@ class diaspora {
case "StatusMessage":
return self::item_retraction($importer, $contact, $data);;
case "Contact":
case "Person":
/// @todo What should we do with an "unshare"?
// Removing the contact isn't correct since we still can read the public items
//contact_remove($contact["id"]);
contact_remove($contact["id"]);
return true;
default: