aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-01-29 14:33:43 -0800
committerzotlabs <mike@macgirvin.com>2020-01-29 14:33:43 -0800
commite9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5 (patch)
tree72f43161bf0aab5d6b6f70391004c3d3866eb635
parent3df5d854b8935b11c67893bbbd24cdf8829eda00 (diff)
parent7d8c6cb9edb1eddb5b1a1868bf02f875330d5771 (diff)
downloadvolse-hubzilla-e9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5.tar.gz
volse-hubzilla-e9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5.tar.bz2
volse-hubzilla-e9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--Zotlabs/Module/Sse_bs.php2
-rw-r--r--Zotlabs/Widget/Activity_filter.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 4340876ea..90e870330 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -404,7 +404,7 @@ class Sse_bs extends Controller {
foreach($mids as $mid)
$b64mids[] = 'b64.' . base64url_encode($mid);
- $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']);
+ $forums[$x]['notify_link'] = z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id'];
$forums[$x]['name'] = $forums[$x]['xchan_name'];
$forums[$x]['addr'] = $forums[$x]['xchan_addr'];
$forums[$x]['url'] = $forums[$x]['xchan_url'];
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php
index ae5c0af6e..0fc60ca9b 100644
--- a/Zotlabs/Widget/Activity_filter.php
+++ b/Zotlabs/Widget/Activity_filter.php
@@ -2,6 +2,7 @@
namespace Zotlabs\Widget;
+use App;
use Zotlabs\Lib\Apps;
class Activity_filter {
@@ -63,6 +64,7 @@ class Activity_filter {
if(feature_enabled(local_channel(),'forums_tab')) {
$forums = get_forum_channels(local_channel());
+ $channel = App::get_channel();
if($forums) {
foreach($forums as $f) {
@@ -73,7 +75,7 @@ class Activity_filter {
$fsub[] = [
'label' => $f['xchan_name'],
'img' => $f['xchan_photo_s'],
- 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']),
+ 'url' => (($f['private_forum']) ? $f['xchan_url'] . '/?f=&zid=' . $channel['xchan_addr'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']),
'sel' => $forum_active,
'title' => t('Show posts to this forum'),
'lock' => (($f['private_forum']) ? 'lock' : '')