Move navbar_complete to Acl

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 2c9770f9bdfaa76fe05601e3385445cd31d1d693..e6d1a8a92ee484d2a45b9a65bc98c2b93e719d47 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -9,9 +9,3 @@ use Friendica\Model\Contact;
 
 require_once "mod/proxy.php";
 
-function navbar_complete(App $a) {
-       $search = notags(trim($_REQUEST['search']));
-       $mode = $_REQUEST['smode'];
-
-       return Acl::contactAutocomplete($search, $mode);
-}

diff --git a/mod/acl.php b/mod/acl.php
index e325e4668d0ef7385d6b492d4c2bf7967c1445ee..a178a6922183c9a60d11d333fdc2b37975df6c67 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -4,6 +4,7 @@
 
 use Friendica\App;
 use Friendica\Content\Widget;
+use Friendica\Core\Acl;
 use Friendica\Core\Addon;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
@@ -184,7 +185,11 @@ function acl_content(App $a)
                );
        } elseif ($type == 'x') {
                // autocomplete for global contact search (e.g. navbar search)
-               $r = navbar_complete($a);
+               $search = notags(trim($_REQUEST['search']));
+               $mode = $_REQUEST['smode'];
+
+               $r = Acl::contactAutocomplete($search, $mode);
+
                $contacts = [];
                foreach ($r as $g) {
                        $contacts[] = [