get markup template

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 8f630409ff5da42e6aad7d8f228adbe52aea6637..9abd259acd0550f60c59f924aafed59f24ed5115 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -9,6 +9,7 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -291,8 +292,8 @@ class ACL extends BaseObject
                        }
                }
 
-               $tpl = get_markup_template('acl_selector.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('acl_selector.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$showall' => L10n::t('Visible to everybody'),
                        '$show' => L10n::t('show'),
                        '$hide' => L10n::t('don\'t show'),
@@ -341,8 +342,7 @@ class ACL extends BaseObject
                if (Config::get('system', 'poco_local_search')) {
                        $return = GContact::searchByName($search, $mode);
                } else {
-                       $a = self::getApp();
-                       $p = $a->pager['page'] != 1 ? '&p=' . $a->pager['page'] : '';
+                       $p = defaults($_GET, 'page', 1) != 1 ? '&p=' . defaults($_GET, 'page', 1) : '';
 
                        $curlResult = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
                        if ($curlResult->isSuccess()) {