aboutsummaryrefslogtreecommitdiffstats
path: root/mod/removeme.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/removeme.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-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/removeme.php')
-rw-r--r--mod/removeme.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/removeme.php b/mod/removeme.php
index d2ff013b8..492738b77 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -2,7 +2,7 @@
function removeme_post(&$a) {
- if(! local_user())
+ if(! local_channel())
return;
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
@@ -35,7 +35,7 @@ function removeme_post(&$a) {
$global_remove = intval($_POST['global']);
- channel_remove(local_user(),1 - $global_remove,true);
+ channel_remove(local_channel(),1 - $global_remove,true);
}
@@ -43,7 +43,7 @@ function removeme_post(&$a) {
function removeme_content(&$a) {
- if(! local_user())
+ if(! local_channel())
goaway(z_root());
$hash = random_string();