From ce9e0f3649d89c7acdc1290ffb3175ff84eab664 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 25 Feb 2018 19:58:23 -0500 Subject: [PATCH] Move prune_deadguys to Contact --- include/acl_selectors.php | 5 ----- src/Model/Group.php | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index b965c2ca64..9eab2ffd7c 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -9,11 +9,6 @@ use Friendica\Model\Contact; require_once "mod/proxy.php"; -function prune_deadguys($arr) { - Contact::pruneUnavailable($arr); - return $arr; -} - function get_acl_permissions($user = null) { return Acl::getDefaultUserPermissions($user); } diff --git a/src/Model/Group.php b/src/Model/Group.php index 9e472a7ade..c1430642de 100644 --- a/src/Model/Group.php +++ b/src/Model/Group.php @@ -4,8 +4,8 @@ */ namespace Friendica\Model; -use Friendica\Core\L10n; use Friendica\BaseObject; +use Friendica\Core\L10n; use Friendica\Database\DBM; use dba; @@ -290,7 +290,7 @@ class Group extends BaseObject if ($check_dead && !$use_gcontact) { require_once 'include/acl_selectors.php'; - $return = prune_deadguys($return); + Contact::pruneUnavailable($return); } return $return; }