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

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index b92a0d980fb57e1150214c07aee7e5b590277c05..f318dc202c04c9101b72cb9afe9b97352f6cbe3b 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -5,9 +5,9 @@ require_once('include/follow.php');
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-function follow_content(&$a) {
+function follow_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -63,7 +63,7 @@ function follow_content(&$a) {
                $request = $ret["request"];
                $tpl = get_markup_template('dfrn_request.tpl');
        } else {
-               $request = $a->get_baseurl()."/follow";
+               $request = App::get_baseurl()."/follow";
                $tpl = get_markup_template('auto_request.tpl');
        }
 
@@ -137,21 +137,21 @@ function follow_content(&$a) {
        $a->page['aside'] = "";
        profile_load($a, "", 0, get_contact_details_by_url($ret["url"]));
 
-       // Show last public posts
        if ($gcontact_id <> 0) {
                $o .= replace_macros(get_markup_template('section_title.tpl'),
                                                array('$title' => t('Status Messages and Posts')
                ));
 
-               $o .= posts_from_gcontact($a, $gcontact_id);
+               // Show last public posts
+               $o .= posts_from_contact_url($a, $ret["url"]);
        }
 
        return $o;
 }
 
-function follow_post(&$a) {
+function follow_post(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -175,12 +175,12 @@ function follow_post(&$a) {
                        notice($result['message']);
                goaway($return_url);
        } elseif ($result['cid'])
-               goaway($a->get_baseurl().'/contacts/'.$result['cid']);
+               goaway(App::get_baseurl().'/contacts/'.$result['cid']);
 
        info( t('Contact added').EOL);
 
        if(strstr($return_url,'contacts'))
-               goaway($a->get_baseurl().'/contacts/'.$contact_id);
+               goaway(App::get_baseurl().'/contacts/'.$contact_id);
 
        goaway($return_url);
        // NOTREACHED