clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4015 from annando/archive-again

Browse Source 
Don't archive "self" contacts
This commit is contained in:
Hypolite Petovan
2017-12-05 16:38:48 -05:00
committed by GitHub
parent 2bcc70fa77 e5c2b7a243
commit 75c7dc0fa0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/items.php
View File

@@ -1157,6 +1157,14 @@ function item_set_last_item($arr) {
Contact::unmarkForArchival($contact);
}
// Unarchive the contact if it is a toplevel posting
if ($arr["parent-uri"] === $arr["uri"]) {
$contact = dba::select('contact', [], ['id' => $arr["contact-id"]], ['limit' => 1]);
if ($contact['term-date'] > NULL_DATE) {
Contact::unmarkForArchival($contact);
}
}
$update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
// Is it a forum? Then we don't care about the rules from above