Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index a514439db6b8fd2900bf440b2d3ef56492d3f18d..0ec753466267a738fd626ba922abecafec02332b 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -8,11 +8,13 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 require_once 'include/text.php';
 
@@ -54,7 +56,7 @@ function match_content(App $a)
        $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
 
        if ($tags) {
-               $pager = new Pager($a->query_string, $j->items_page);
+               $pager = new Pager($a->query_string);
 
                $params['s'] = $tags;
                if ($pager->getPage() != 1) {
@@ -70,10 +72,12 @@ function match_content(App $a)
                $j = json_decode($x);
 
                if (count($j->results)) {
+                       $pager->setItemsPerPage($j->items_page);
+
                        $id = 0;
 
                        foreach ($j->results as $jj) {
-                               $match_nurl = normalise_link($jj->url);
+                               $match_nurl = Strings::normaliseLink($jj->url);
                                $match = q(
                                        "SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
                                        intval(local_user()),
@@ -110,9 +114,9 @@ function match_content(App $a)
                                }
                        }
 
-                       $tpl = get_markup_template('viewcontact_template.tpl');
+                       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-                       $o .= replace_macros($tpl, [
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$title'    => L10n::t('Profile Match'),
                                '$contacts' => $entries,
                                '$paginate' => $pager->renderFull($j->total)