aboutsummaryrefslogtreecommitdiffstats
path: root/mod/follow.php
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
commitec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch)
treecf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /mod/follow.php
parent652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff)
parent409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff)
downloadvolse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/follow.php')
-rw-r--r--mod/follow.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/follow.php b/mod/follow.php
index 663fb7536..e480a0964 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -26,10 +26,9 @@ function follow_init(&$a) {
// If we can view their stream, pull in some posts
- if($result['abook']['abook_their_perms'] & PERMS_R_STREAM)
+ if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss'))
proc_run('php','include/onepoll.php',$result['abook']['abook_id']);
-
goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
}