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/tagrm.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/tagrm.php')
| -rw-r--r-- | mod/tagrm.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/tagrm.php b/mod/tagrm.php index 38787cb0b..56e842fb8 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -4,7 +4,7 @@ require_once('bbcode.php'); function tagrm_post(&$a) { - if(! local_user()) + if(! local_channel()) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); @@ -16,7 +16,7 @@ function tagrm_post(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) @@ -52,7 +52,7 @@ function tagrm_post(&$a) { function tagrm_content(&$a) { - if(! local_user()) { + if(! local_channel()) { goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); // NOTREACHED } @@ -65,7 +65,7 @@ function tagrm_content(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) @@ -105,7 +105,7 @@ function tagrm_content(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) |