aboutsummaryrefslogtreecommitdiffstats
path: root/mod/group.php
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-07 21:28:39 +0100
committermarijus <mario@localhost.localdomain>2014-02-07 21:28:39 +0100
commitf62ec4132ed571288737423de386054a4cc8b0d5 (patch)
tree3b19b8c3aa086e4931aac9790d298b2306f71ff7 /mod/group.php
parentfd1c444c45285263f1bb6e8f5c221c3022ab806c (diff)
downloadvolse-hubzilla-f62ec4132ed571288737423de386054a4cc8b0d5.tar.gz
volse-hubzilla-f62ec4132ed571288737423de386054a4cc8b0d5.tar.bz2
volse-hubzilla-f62ec4132ed571288737423de386054a4cc8b0d5.zip
let oneself be added to a collection in exchange for deleted contacts
Diffstat (limited to 'mod/group.php')
-rw-r--r--mod/group.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/group.php b/mod/group.php
index 66e5fbf8e..15e4ff2a3 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -117,10 +117,10 @@ function group_content(&$a) {
check_form_security_token_ForbiddenOnErr('group_member_change', 't');
- $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
+ $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
dbesc(argv(2)),
intval(local_user()),
- intval(ABOOK_FLAG_SELF),
+ intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_BLOCKED),
intval(ABOOK_FLAG_PENDING)
);
@@ -210,10 +210,10 @@ function group_content(&$a) {
group_rmv_member(local_user(),$group['name'],$member['xchan_hash']);
}
- $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
+ $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
intval(local_user()),
intval(ABOOK_FLAG_BLOCKED),
- intval(ABOOK_FLAG_SELF),
+ intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_PENDING)
);