harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't include archived contacts in public posts, unless specifically requested

Browse Source
This commit is contained in:
friendica
2013-08-15 17:43:19 -07:00
parent d46436dc9c
commit 764e0201ce
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Contact.php
View File

@@ -295,8 +295,8 @@ function contact_remove($channel_id, $abook_id) {
$archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
if($archive) {
q("update abook set abook_flags = abook_flags | %d where abook_id = %d and abook_channel = %d limit 1",
intval(ABOOK_FLAG_ARCHIVE),
q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d limit 1",
intval(ABOOK_FLAG_ARCHIVED),
intval($abook_id),
intval($channel_id)
);

5
include/items.php
View File

@@ -31,10 +31,11 @@ function collect_recipients($item,&$private) {
}
else {
$recipients = array();
$r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d)",
$r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d)",
intval($item['uid']),
intval(ABOOK_FLAG_SELF),
intval(ABOOK_FLAG_PENDING)
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_ARCHIVED)
);
if($r) {
foreach($r as $rr) {