diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f794040f7..a046796ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ HumHub Changelog - Fix #5856: Fix SMTPS Config Migration - Fix #5854: Don't validate user language on approve - Fix #5875: LDAP user creation broken without email address +- Fix #5877: Fix wrong empty profile stream message - Fix #5874: Fix adding licence key after removing it from marketplace diff --git a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js index ca6b95987c..365d15a6a5 100644 --- a/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js +++ b/protected/humhub/modules/stream/resources/js/humhub.stream.Stream.js @@ -672,7 +672,7 @@ humhub.module('stream.Stream', function (module, require, $) { }; Stream.prototype.hasActiveFilters = function () { - return this.filter && this.filter.getActiveFilterCount({exclude: ['sort']}) > 0; + return this.filter && this.filter.getActiveFilterCount({exclude: ['sort', 'scope']}) > 0; }; /** diff --git a/protected/humhub/modules/user/widgets/StreamViewer.php b/protected/humhub/modules/user/widgets/StreamViewer.php index a192f88ed7..a39749d3fe 100644 --- a/protected/humhub/modules/user/widgets/StreamViewer.php +++ b/protected/humhub/modules/user/widgets/StreamViewer.php @@ -50,14 +50,12 @@ class StreamViewer extends BaseStreamViewer $this->messageStreamEmptyCss = 'placeholder-empty-stream'; } - if (empty($this->messageStreamEmpty)) { - if ($canCreatePost) { - $this->messageStreamEmpty = $this->contentContainer->is(Yii::$app->user->getIdentity()) - ? Yii::t('UserModule.profile', 'Your profile stream is still empty
Get started and post something...') - : Yii::t('UserModule.profile', 'This profile stream is still empty
Be the first and post something...'); - } else { - $this->messageStreamEmpty = Yii::t('UserModule.profile', 'This profile stream is still empty!'); - } + if ($canCreatePost) { + $this->messageStreamEmpty = $this->contentContainer->is(Yii::$app->user->getIdentity()) + ? Yii::t('UserModule.profile', 'Your profile stream is still empty
Get started and post something...') + : Yii::t('UserModule.profile', 'This profile stream is still empty
Be the first and post something...'); + } else { + $this->messageStreamEmpty = Yii::t('UserModule.profile', 'This profile stream is still empty!'); } }