diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 13:15:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 13:15:10 -0700 |
| commit | 35f17acb388f68745068d6a60e12c7b777b92282 (patch) | |
| tree | c27819dec82394a68699d8f4de1a5625b5f1c571 /Zotlabs/Module/Follow.php | |
| parent | 58cf5f310d89026fb526e201c301075725044e48 (diff) | |
| parent | 47e1c4e059303167b173a10b986086d3c00c8384 (diff) | |
| download | volse-hubzilla-35f17acb388f68745068d6a60e12c7b777b92282.tar.gz volse-hubzilla-35f17acb388f68745068d6a60e12c7b777b92282.tar.bz2 volse-hubzilla-35f17acb388f68745068d6a60e12c7b777b92282.zip | |
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
Diffstat (limited to 'Zotlabs/Module/Follow.php')
| -rw-r--r-- | Zotlabs/Module/Follow.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index 3641330c9..da9ab3670 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -47,12 +47,13 @@ class Follow extends \Zotlabs\Web\Controller { if($abconfig) $clone['abconfig'] = $abconfig; - build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)), true); + $can_view_stream = intval(get_abconfig($channel['channel_id'],$clone['abook_xchan'],'their_perms','view_stream')); // If we can view their stream, pull in some posts - if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss')) + if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) \Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id'])); goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1'); |