diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-22 13:56:08 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-22 13:56:08 +0200 |
| commit | d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75 (patch) | |
| tree | dbdc1dbffe5c56dcff18669e957f679b5ae37bb3 /mod/follow.php | |
| parent | afdc639f17f0f5e12f291b512ccc12b3df6b2acf (diff) | |
| parent | 564ade0685470158ac487d9a9f18a21079c729bb (diff) | |
| download | volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.tar.gz volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.tar.bz2 volse-hubzilla-d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75.zip | |
Merge branch 'master' into newui
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/follow.php b/mod/follow.php index 14b2ea46c..df4d2e630 100644 --- 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 } |