Merge remote-tracking branch 'origin' into develop

CHANGELOG.md

@@ -5,6 +5,8 @@ HumHub Changelog
 ---------------------------
 - Fix #6596: Fix duplicate error and hint for RichText editor with defined form
 - Fix #6595: Fix mimetype of converted preview svg file to png after uploading
+- Fix #6614: Fix undefined error on live event of follow action
+- Fix #6615: Improve scrolling to anchor with fixed header
 
 1.14.4 (September 20, 2023)
 ---------------------------

protected/humhub/modules/live/Events.php

@@ -8,12 +8,12 @@
 
 namespace humhub\modules\live;
 
-use Yii;
-use humhub\modules\live\Module;
+use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\friendship\FriendshipEvent;
 use humhub\modules\space\MemberEvent;
 use humhub\modules\user\events\FollowEvent;
-use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\user\models\User;
+use Yii;
 
 /**
  * Events provides callbacks to handle events.
@@ -57,7 +57,7 @@ class Events extends \yii\base\BaseObject
      */
     public static function onFollowEvent(FollowEvent $event)
     {
-        if ($event->target instanceof ContentContainerActiveRecord) {
+        if ($event->target instanceof ContentContainerActiveRecord && $event->user instanceof User) {
             Yii::$app->getModule('live')->refreshLegitimateContentContainerIds($event->user);
         }
     }

static/less/base.less

@@ -1,6 +1,10 @@
 //
 // General
 // --------------------------------------------------
+html {
+    scroll-padding-top: 130px;
+}
+
 body {
     .text-break();
     padding-top: 130px;