Move prune_deadguys to Contact

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index b965c2ca64b563294310593c57a7c1a5578340b7..9eab2ffd7cc8761913dac20c356a697f99bc8318 100644 (file)
--- 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 9e472a7ade5f378a34f189dfff997cfb23f72437..c1430642de5480c43141ffbc9837b6b12898121f 100644 (file)
--- 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;
        }