Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 7a3514b3a73aa4942ca00f009cc6128361782461..e67beb84c2a6252e9437782285b7a26f22ddcbef 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -99,7 +99,7 @@ function new_contact($uid,$url,$interactive = false) {
        if($ret['network'] === NETWORK_DFRN) {
                if($interactive) {
                        if(strlen($a->path))
-                               $myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
+                               $myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
                        else
                                $myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
 
@@ -254,7 +254,7 @@ function new_contact($uid,$url,$interactive = false) {
                intval($uid)
        );
 
-       if(! dbm::is_result($r)) {
+       if (! dbm::is_result($r)) {
                $result['message'] .=  t('Unable to retrieve contact information.') . EOL;
                return $result;
        }