aboutsummaryrefslogtreecommitdiffstats
path: root/include/channel.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-13 14:11:08 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-13 14:11:08 +0200
commitf0cdbd0f520d14f3840caf41856f56133e9c3970 (patch)
treeea6bf0ca2a5a878f0156286a928c70c427958e76 /include/channel.php
parent321b2b9b49e7c4412906e56ffdcc1be4bf8441be (diff)
parent9632cafa95e76a53460e761385a3376f14881eae (diff)
downloadvolse-hubzilla-f0cdbd0f520d14f3840caf41856f56133e9c3970.tar.gz
volse-hubzilla-f0cdbd0f520d14f3840caf41856f56133e9c3970.tar.bz2
volse-hubzilla-f0cdbd0f520d14f3840caf41856f56133e9c3970.zip
Merge branch 'dev' into 3.8RC
Diffstat (limited to 'include/channel.php')
-rw-r--r--include/channel.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php
index 6a934cb82..22cdb9fe7 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2602,8 +2602,6 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
}
}
-
-
$r = q("select id from item where uid = %d", intval($channel_id));
if($r) {
foreach($r as $rv) {
@@ -2611,7 +2609,6 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
}
}
-
q("delete from abook where abook_xchan = '%s' and abook_self = 1 ",
dbesc($channel['channel_hash'])
);