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/tagger.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/tagger.php')
-rw-r--r-- | mod/tagger.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/tagger.php b/mod/tagger.php index 83f6ee029..7615e31cc 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function tagger_content(&$a) { - if(! local_user() && ! remote_user()) { + if(! local_channel() && ! remote_channel()) { return; } @@ -27,7 +27,7 @@ function tagger_content(&$a) { $r = q("SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = '%s' and uid = %d LIMIT 1", dbesc($item_id), - intval(local_user()) + intval(local_channel()) ); if((! $item_id) || (! $r)) { |