aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-09 16:00:03 -0800
committerfriendica <info@friendica.com>2015-02-09 16:00:03 -0800
commit0f494a5a2ab3fbdd5d9f5f5a621b458b755b227b (patch)
tree40b078b4ac0d0593d9ad506ca50ff49bc894056b /include
parented810a360f9a52e1e57ea95723d46b68eb586f69 (diff)
parente9125ed922eadd24642e592ee61a758db951215e (diff)
downloadvolse-hubzilla-0f494a5a2ab3fbdd5d9f5f5a621b458b755b227b.tar.gz
volse-hubzilla-0f494a5a2ab3fbdd5d9f5f5a621b458b755b227b.tar.bz2
volse-hubzilla-0f494a5a2ab3fbdd5d9f5f5a621b458b755b227b.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/attach.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/attach.php b/include/attach.php
index f61fea9a5..f878a886f 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1258,15 +1258,10 @@ function recursive_activity_recipients($allow_cid, $allow_gid, $deny_cid, $deny_
}
function in_group($group_id) {
- //TODO: make these two queries one with a join.
- $x = q("SELECT id FROM groups WHERE hash = '%s'",
+ $r = q("SELECT xchan FROM group_member left join groups on group_member.gid = group.id WHERE hash = '%s' ",
dbesc($group_id)
);
- $r = q("SELECT xchan FROM group_member WHERE gid = %d",
- intval($x[0]['id'])
- );
-
foreach($r as $ig) {
$group_members[] = $ig['xchan'];
}