From fd26e7a26936031b0e6d6fa1c4059fc2735a63d0 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Fri, 20 Feb 2026 13:29:03 +0300 Subject: [PATCH 1/2] Update for HumHub 1.19 --- Events.php | 3 ++- docs/CHANGELOG.md | 4 ++++ module.json | 4 ++-- stream/filters/BookmarkStreamFilter.php | 2 +- tests/codeception/fixtures/ContentBookmarkFixture.php | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Events.php b/Events.php index e65c6ff..b14b7d9 100644 --- a/Events.php +++ b/Events.php @@ -8,6 +8,7 @@ namespace humhub\modules\contentBookmarks; +use humhub\helpers\ControllerHelper; use humhub\modules\content\widgets\WallEntryControls; use humhub\modules\contentBookmarks\helpers\Url; use humhub\modules\contentBookmarks\models\filters\BookmarksContentStreamFilter; @@ -55,7 +56,7 @@ public static function onProfileMenuInit($event) 'url' => Url::toSavedContent($event->sender->user), 'icon' => 'bookmark', 'sortOrder' => 250, - 'isActive' => MenuLink::isActiveState('content-bookmarks', 'saved'), + 'isActive' => ControllerHelper::isActivePath('content-bookmarks', 'saved'), ])); } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 70dc18d..b9d911f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.3.0 (Unreleased) +------------------ +- Enh #40: Update for HumHub 1.19 + 1.2.1 (TBD) ----------- - Fix #26: Update module resources path diff --git a/module.json b/module.json index 71cde40..f789a53 100644 --- a/module.json +++ b/module.json @@ -5,9 +5,9 @@ "keywords": [ "content","bookmarks" ], - "version": "1.2.1", + "version": "1.3.0", "humhub": { - "minVersion": "1.18" + "minVersion": "1.19" }, "screenshots": [ "resources/screenshot1.png", diff --git a/stream/filters/BookmarkStreamFilter.php b/stream/filters/BookmarkStreamFilter.php index 42a4f45..b043c72 100644 --- a/stream/filters/BookmarkStreamFilter.php +++ b/stream/filters/BookmarkStreamFilter.php @@ -41,7 +41,7 @@ public function apply() // Limit to public posts when no member if (Yii::$app->user->isGuest) { $this->query->andWhere('content.visibility = :visibility', [':visibility' => Content::VISIBILITY_PUBLIC]); - } elseif (!Yii::$app->user->getIdentity()->canViewAllContent()) { + } elseif (!Yii::$app->user->getIdentity()->canManageAllContent()) { // Limit only if current User/Admin cannot view all content $this->query->andWhere('content.visibility = :visibility' . ' OR content.created_by = :userId' diff --git a/tests/codeception/fixtures/ContentBookmarkFixture.php b/tests/codeception/fixtures/ContentBookmarkFixture.php index 1ac7dfb..fc02992 100644 --- a/tests/codeception/fixtures/ContentBookmarkFixture.php +++ b/tests/codeception/fixtures/ContentBookmarkFixture.php @@ -8,11 +8,11 @@ namespace humhub\modules\contentBookmarks\tests\codeception\fixtures; -use humhub\modules\user\models\Group; +use humhub\modules\contentBookmarks\models\ContentBookmark; use yii\test\ActiveFixture; class ContentBookmarkFixture extends ActiveFixture { - public $modelClass = Group::class; + public $modelClass = ContentBookmark::class; public $dataFile = '@content-bookmarks/tests/codeception/fixtures/data/content_bookmark.php'; } From 2327c05b7947b11622397f6eb46185e468e0468a Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Fri, 5 Jun 2026 13:33:14 +0200 Subject: [PATCH 2/2] Release 1.3.0 --- docs/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b9d911f..39ba953 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,8 +1,8 @@ Changelog ========= -1.3.0 (Unreleased) ------------------- +1.3.0 (June 5, 2026) +-------------------- - Enh #40: Update for HumHub 1.19 1.2.1 (TBD)