aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-02-26 09:20:44 +0100
committerMario Vavti <mario@mariovavti.com>2016-02-26 09:20:44 +0100
commitd19dfc87a6c00ebb0434a46664621f0b0585c97b (patch)
tree5555d9cfb95d7399e8f1f82a723f841e84a4c6de
parent5ad9b48f1d916425e41f475319c7237293d055b9 (diff)
downloadvolse-hubzilla-d19dfc87a6c00ebb0434a46664621f0b0585c97b.tar.gz
volse-hubzilla-d19dfc87a6c00ebb0434a46664621f0b0585c97b.tar.bz2
volse-hubzilla-d19dfc87a6c00ebb0434a46664621f0b0585c97b.zip
get rid of duplicate function
-rw-r--r--include/attach.php29
1 files changed, 2 insertions, 27 deletions
diff --git a/include/attach.php b/include/attach.php
index 8595d5d86..29daa26ac 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1705,7 +1705,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
//turn allow_gid into allow_cid's
foreach($arr_allow_gid as $gid) {
- $in_group = in_group($gid);
+ $in_group = group_get_members($gid);
$arr_allow_cid = array_unique(array_merge($arr_allow_cid, $in_group));
}
@@ -1727,7 +1727,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
* */
if($parent_arr['allow_gid']) {
foreach($parent_arr['allow_gid'][$count] as $gid) {
- $in_group = in_group($gid);
+ $in_group = group_get_members($gid);
$parent_arr['allow_cid'][$count] = array_unique(array_merge($parent_arr['allow_cid'][$count], $in_group));
}
}
@@ -1808,31 +1808,6 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
return $ret;
}
-/**
- * @brief Returns members of a group.
- *
- * @param int $group_id id of the group to look up
- */
-function in_group($group_id) {
- $group_members = array();
-
- /** @TODO make these two queries one with a join. */
- $x = q("SELECT id FROM groups 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'];
- }
-
- return $group_members;
-}
-
-
function filepath_macro($s) {
return str_replace(