D* queue

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 14b2ea46c11404beca0100256e3637529acd7eb3..df4d2e630a9fb57d22e522a80cea8675c709267d 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -100,9 +100,9 @@ function follow_post(&$a) {
                        $new_relation = CONTACT_IS_FOLLOWER;
 
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
                        `writable`, `blocked`, `readonly`, `pending` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
                        intval(local_user()),
                        dbesc(datetime_convert()),
                        dbesc($ret['url']),
@@ -114,6 +114,7 @@ function follow_post(&$a) {
                        dbesc($ret['nick']),
                        dbesc($ret['photo']),
                        dbesc($ret['network']),
+                       dbesc($ret['pubkey']),
                        intval($new_relation),
                        intval($ret['priority']),
                        intval($writeable)
@@ -190,11 +191,12 @@ function follow_post(&$a) {
                }
                if($contact['network'] == NETWORK_DIASPORA) {
                        require_once('include/diaspora.php');
-                       $ret = diaspora_share($a->user,$r[0]);
+                       $ret = diaspora_share($a->user,$contact);
                        logger('mod_follow: diaspora_share returns: ' . $ret);
                }
        }
 
-       goaway($_SESSION['return_url']);
+       goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+//     goaway($_SESSION['return_url']);
        // NOTREACHED
 }