Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index aed9809ca24a786b713bd1492463613d7a7aa011..9c70ba21ab4c19c4721d7b8d345d489af4eb350f 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -15,6 +15,7 @@
  */
 
 require_once('include/enotify.php');
+require_once('include/group.php');
 
 function dfrn_confirm_post(&$a,$handsfree = null) {
 
@@ -427,8 +428,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                        if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
                                require_once('include/diaspora.php');
-                               $ret = diaspora_share($user[0],$r[0]);
-                               logger('mod_follow: diaspora_share returns: ' . $ret);
+                               $ret = diaspora::send_share($user[0],$r[0]);
+                               logger('share returns: ' . $ret);
                        }
 
                        // Send a new friend post if we are allowed to...
@@ -491,10 +492,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                }
 
                $def_gid = get_default_group($uid, $contact["network"]);
-               if($contact && intval($def_gid)) {
-                       require_once('include/group.php');
+               if($contact && intval($def_gid))
                        group_add_member($uid, '', $contact['id'], $def_gid);
-               }
 
                // Let's send our user to the contact editor in case they want to
                // do anything special with this new friend.