aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-10 13:33:15 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-10 13:33:15 +0200
commitd2e366a46fbdb40c7c6704b3a7f55ad235c93bf3 (patch)
treef815c87d37bdbb7f8a8ee0a7bc2f0074bd8ed1bc /include
parentc06b37b798d604a8e5768b8c9b52422b4b34ae36 (diff)
parentc6f3298f7864756f4a9b7827e8490a3ee859f82f (diff)
downloadvolse-hubzilla-d2e366a46fbdb40c7c6704b3a7f55ad235c93bf3.tar.gz
volse-hubzilla-d2e366a46fbdb40c7c6704b3a7f55ad235c93bf3.tar.bz2
volse-hubzilla-d2e366a46fbdb40c7c6704b3a7f55ad235c93bf3.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-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'])
);