aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2016-08-12 20:43:05 +0200
committerzottel <github@zottel.net>2016-08-12 20:43:05 +0200
commite4bdc92834be9f308ef0f6a253c81f90d1e7537b (patch)
treee38f2f59ab212ea9403770427b8e4c36aa4aca96 /include/zot.php
parent8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (diff)
parentebbe18a426e6959b6bd8bdf23f36902b1a21db1f (diff)
downloadvolse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.tar.gz
volse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.tar.bz2
volse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 4e443652f..3a1986e3b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3784,9 +3784,11 @@ function zotinfo($arr) {
// check if it has characteristics of a public forum based on custom permissions.
$t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ",
intval($e['channel_id']),
- intval($e['channel_hash'])
+ dbesc($e['channel_hash'])
);
+
$ch = 0;
+
if($t) {
foreach($t as $tt) {
if($tt['k'] == 'tag_deliver' && $tt['v'] == 1)