diff options
| author | friendica <info@friendica.com> | 2013-08-15 17:43:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-15 17:43:19 -0700 |
| commit | 764e0201ce8259c84a3b6ce643a52effe9dc8a59 (patch) | |
| tree | 7be4dbbba28d8858d2ab2cdb7073df256704a445 | |
| parent | d46436dc9c115d29a18a29203bd12d3246472365 (diff) | |
| download | volse-hubzilla-764e0201ce8259c84a3b6ce643a52effe9dc8a59.tar.gz volse-hubzilla-764e0201ce8259c84a3b6ce643a52effe9dc8a59.tar.bz2 volse-hubzilla-764e0201ce8259c84a3b6ce643a52effe9dc8a59.zip | |
don't include archived contacts in public posts, unless specifically requested
| -rw-r--r-- | include/Contact.php | 4 | ||||
| -rwxr-xr-x | include/items.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/Contact.php b/include/Contact.php index 992ed27e2..bf536ccd5 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -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) ); diff --git a/include/items.php b/include/items.php index 6d853323f..df49ba5c7 100755 --- a/include/items.php +++ b/include/items.php @@ -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) { |