diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
| commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
| tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /mod/follow.php | |
| parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
| parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
| download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/follow.php b/mod/follow.php index 9f5a8183b..962bb71a7 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -15,7 +15,7 @@ function follow_init(&$a) { $confirm = intval($_REQUEST['confirm']); $result = new_contact($uid,$url,$a->get_channel(),true,$confirm); - + if($result['success'] == false) { if($result['message']) notice($result['message']); @@ -24,7 +24,13 @@ function follow_init(&$a) { info( t('Channel added.') . EOL); - goaway(z_root() . '/connections/' . $result['abook']['abook_id']); + // If we can view their stream, pull in some posts + + if($result['abook']['abook_their_perms'] & PERMS_R_STREAM) + proc_run('php','include/onepoll.php',$result['abook']['abook_id']); + + + goaway(z_root() . '/connedit/' . $result['abook']['abook_id']); } |