From 12f092281d01eb6eee74a3bc4350cf8030f244f5 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Wed, 21 Jan 2026 18:07:31 +0300
Subject: [PATCH 1/3] Improve topic url of hidden wiki pages on stream

---
 docs/CHANGELOG.md            |  1 +
 views/page/_view_content.php |  4 ++--
 widgets/WikiTopicBadge.php   | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 widgets/WikiTopicBadge.php

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 7207142e..2b2f1c71 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 2.5.5 (Unreleased)
 -----------------------
 - Fix #404: `.row` HTML elements without `.container` overflow
+- Enh #412: Improve topic url of hidden wiki pages on stream
 
 2.5.4 (December 12, 2025)
 -------------------------
diff --git a/views/page/_view_content.php b/views/page/_view_content.php
index ca913297..66d9f326 100644
--- a/views/page/_view_content.php
+++ b/views/page/_view_content.php
@@ -3,10 +3,10 @@
 use humhub\components\View;
 use humhub\helpers\Html;
 use humhub\modules\topic\models\Topic;
-use humhub\modules\topic\widgets\TopicBadge;
 use humhub\modules\wiki\helpers\Url;
 use humhub\modules\wiki\models\WikiPage;
 use humhub\modules\wiki\widgets\WikiRichText;
+use humhub\modules\wiki\widgets\WikiTopicBadge;
 use humhub\widgets\bootstrap\Button;
 
 /* @var $this View */
@@ -16,7 +16,7 @@
 ?>
 <div class="topic-badge-list">
 <?php foreach ($page->content->getTags(Topic::class)->all() as $topic) : ?>
-    <?= TopicBadge::forTopic($topic) ?>
+    <?= WikiTopicBadge::getWikiTopicBadge($topic, $page) ?>
 <?php endforeach; ?>
 </div>
 
diff --git a/widgets/WikiTopicBadge.php b/widgets/WikiTopicBadge.php
new file mode 100644
index 00000000..94e1c01e
--- /dev/null
+++ b/widgets/WikiTopicBadge.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\wiki\widgets;
+
+use humhub\modules\stream\helpers\StreamHelper;
+use humhub\modules\topic\models\Topic;
+use humhub\modules\topic\widgets\TopicBadge;
+use humhub\modules\wiki\models\WikiPage;
+use humhub\widgets\bootstrap\Link;
+
+class WikiTopicBadge extends TopicBadge
+{
+    public static function getWikiTopicBadge(Topic $topic, WikiPage $page): static
+    {
+        $badge = parent::forTopic($topic);
+
+        if ($page->content->hidden) {
+            $badge->withLink(Link::withAction('', 'topic.addTopic')->options([
+                'data-topic-id' => $topic->id,
+                'data-topic-url' => StreamHelper::createUrl($page->content->container, [
+                    'topicId' => $topic->id,
+                    'filters[entry_hidden]' => 1,
+                ]),
+            ]));
+        }
+
+        return $badge;
+    }
+}

From 0fce856894141cf3a06b37ac7e04d335edc73bb6 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Thu, 22 Jan 2026 11:56:43 +0300
Subject: [PATCH 2/3] Improve topic url of hidden wiki pages on stream

---
 module.json                  |  2 +-
 views/page/_view_content.php |  4 ++--
 widgets/WikiTopicBadge.php   | 35 -----------------------------------
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 widgets/WikiTopicBadge.php

diff --git a/module.json b/module.json
index ef6ceccb..9887764e 100644
--- a/module.json
+++ b/module.json
@@ -5,7 +5,7 @@
     "keywords": ["wiki"],
     "version": "2.5.5",
     "humhub": {
-        "minVersion": "1.18",
+        "minVersion": "1.18.0-beta.7",
         "maxVersion": "1.18"
     },
     "homepage": "https://github.com/humhub/wiki",
diff --git a/views/page/_view_content.php b/views/page/_view_content.php
index 66d9f326..f165fe9a 100644
--- a/views/page/_view_content.php
+++ b/views/page/_view_content.php
@@ -3,10 +3,10 @@
 use humhub\components\View;
 use humhub\helpers\Html;
 use humhub\modules\topic\models\Topic;
+use humhub\modules\topic\widgets\TopicBadge;
 use humhub\modules\wiki\helpers\Url;
 use humhub\modules\wiki\models\WikiPage;
 use humhub\modules\wiki\widgets\WikiRichText;
-use humhub\modules\wiki\widgets\WikiTopicBadge;
 use humhub\widgets\bootstrap\Button;
 
 /* @var $this View */
@@ -16,7 +16,7 @@
 ?>
 <div class="topic-badge-list">
 <?php foreach ($page->content->getTags(Topic::class)->all() as $topic) : ?>
-    <?= WikiTopicBadge::getWikiTopicBadge($topic, $page) ?>
+    <?= TopicBadge::topic($topic, $page->content) ?>
 <?php endforeach; ?>
 </div>
 
diff --git a/widgets/WikiTopicBadge.php b/widgets/WikiTopicBadge.php
deleted file mode 100644
index 94e1c01e..00000000
--- a/widgets/WikiTopicBadge.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- */
-
-namespace humhub\modules\wiki\widgets;
-
-use humhub\modules\stream\helpers\StreamHelper;
-use humhub\modules\topic\models\Topic;
-use humhub\modules\topic\widgets\TopicBadge;
-use humhub\modules\wiki\models\WikiPage;
-use humhub\widgets\bootstrap\Link;
-
-class WikiTopicBadge extends TopicBadge
-{
-    public static function getWikiTopicBadge(Topic $topic, WikiPage $page): static
-    {
-        $badge = parent::forTopic($topic);
-
-        if ($page->content->hidden) {
-            $badge->withLink(Link::withAction('', 'topic.addTopic')->options([
-                'data-topic-id' => $topic->id,
-                'data-topic-url' => StreamHelper::createUrl($page->content->container, [
-                    'topicId' => $topic->id,
-                    'filters[entry_hidden]' => 1,
-                ]),
-            ]));
-        }
-
-        return $badge;
-    }
-}

From e627e276f90b25c85daf7f0454293259b5510014 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Fri, 23 Jan 2026 11:18:56 +0300
Subject: [PATCH 3/3] Improve topic url of hidden wiki pages on stream

---
 views/page/_view_content.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/page/_view_content.php b/views/page/_view_content.php
index f165fe9a..4f4eb7f6 100644
--- a/views/page/_view_content.php
+++ b/views/page/_view_content.php
@@ -16,7 +16,7 @@
 ?>
 <div class="topic-badge-list">
 <?php foreach ($page->content->getTags(Topic::class)->all() as $topic) : ?>
-    <?= TopicBadge::topic($topic, $page->content) ?>
+    <?= TopicBadge::forTopic($topic, $page->content) ?>
 <?php endforeach; ?>
 </div>