Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 8bc255023f6d2e7517b04c420cf716eb9bcf4daa..f7274e436666e727f0cd57c3d2c3c0964dfbf2a8 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -23,7 +23,7 @@ function match_content(App &$a) {
        $a->page['aside'] .= findpeople_widget();
        $a->page['aside'] .= follow_widget();
 
-       $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+       $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
        $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
@@ -47,7 +47,7 @@ function match_content(App &$a) {
                if(strlen(get_config('system','directory')))
                        $x = post_url(get_server().'/msearch', $params);
                else
-                       $x = post_url($a->get_baseurl() . '/msearch', $params);
+                       $x = post_url(App::get_baseurl() . '/msearch', $params);
 
                $j = json_decode($x);
 
@@ -68,7 +68,7 @@ function match_content(App &$a) {
 
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-                                       $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+                                       $connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
                                        $photo_menu = array(
                                                'profile' => array(t("View Profile"), zrl($jj->url)),
                                                'follow' => array(t("Connect/Follow"), $connlnk)