diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-06-03 13:27:06 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-06-03 13:27:06 +0200 |
| commit | a42ff1e6d40496cc93481312b47548200e8af380 (patch) | |
| tree | e5895c9a2d5fb65edd9a8dfb53e71ed7867261b3 | |
| parent | 2438af1cb5d8c4d439dae315bffb8eaeb5c153a5 (diff) | |
| download | volse-hubzilla-a42ff1e6d40496cc93481312b47548200e8af380.tar.gz volse-hubzilla-a42ff1e6d40496cc93481312b47548200e8af380.tar.bz2 volse-hubzilla-a42ff1e6d40496cc93481312b47548200e8af380.zip | |
missing $perm_sql
| -rw-r--r-- | Zotlabs/Module/Ping.php | 5 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 3f2015d6d..d95df34a0 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -633,8 +633,11 @@ class Ping extends \Zotlabs\Web\Controller { $result['forums'] = 0; } else { + + $perms_sql = item_permissions_sql(local_channel()) . item_normal(); $fcount = count($forums); $forums['total'] = 0; + for($x = 0; $x < $fcount; $x ++) { $r = q("select sum(item_unseen) as unseen from item where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ", @@ -642,7 +645,7 @@ class Ping extends \Zotlabs\Web\Controller { dbesc($forums[$x]['xchan_hash']) ); if($r[0]['unseen']) { - $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] :z_root() . '/network/?f=&cid=' . $forums[$x]['abook_id']); + $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&cid=' . $forums[$x]['abook_id']); $forums[$x]['name'] = $forums[$x]['xchan_name']; $forums[$x]['url'] = $forums[$x]['xchan_url']; $forums[$x]['photo'] = $forums[$x]['xchan_photo_s']; diff --git a/include/text.php b/include/text.php index ca5a3834f..4a84c09f8 100644 --- a/include/text.php +++ b/include/text.php @@ -3340,8 +3340,6 @@ function get_forum_channels($uid) { if(! $uid) return; - $perms_sql = item_permissions_sql($uid) . item_normal(); - $xf = false; $x1 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'send_stream' and v = '0'", |