diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
| commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
| tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/follow.php | |
| parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip | |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/follow.php b/mod/follow.php index e480a0964..79e2a4fa5 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -5,11 +5,11 @@ require_once('include/follow.php'); function follow_init(&$a) { - if(! local_user()) { + if(! local_channel()) { return; } - $uid = local_user(); + $uid = local_channel(); $url = notags(trim($_REQUEST['url'])); $return_url = $_SESSION['return_url']; $confirm = intval($_REQUEST['confirm']); @@ -35,7 +35,7 @@ function follow_init(&$a) { function follow_content(&$a) { - if(! local_user()) { + if(! local_channel()) { return login(); } }
\ No newline at end of file |