Update method of checking friendship humhub/humhub#6745

metaworx · Jan 17, 2024 · 05c50a0 · 05c50a0
1 parent 3290dca
commit 05c50a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/models/File.php b/models/File.php
@@ -9,6 +9,7 @@
 use humhub\modules\file\libs\FileHelper;
 use humhub\modules\file\models\File as BaseFile;
 use humhub\modules\file\models\FileUpload;
+use humhub\modules\friendship\Module as FriendshipModule;
 use humhub\modules\search\events\SearchAddEvent;
 use humhub\modules\topic\models\Topic;
 use Yii;
@@ -215,7 +216,8 @@ public function updateVisibility($visibility)
 
     public function getVisibilityTitle()
     {
-        if(Yii::$app->getModule('friendship')->getIsEnabled() && $this->content->container instanceof User) {
+        $module = Yii::$app->getModule('friendship');
+        if($module instanceof FriendshipModule && $module->isFriendshipEnabled() && $this->content->container instanceof User) {
             if($this->content->container->isCurrentuser()) {
                 $privateText =  Yii::t('CfilesModule.base', 'This file is only visible for you and your friends.');
             } else {

diff --git a/models/Folder.php b/models/Folder.php
@@ -7,6 +7,7 @@
 use humhub\modules\file\libs\ImageHelper;
 use humhub\modules\file\models\FileContent;
 use humhub\modules\file\libs\FileHelper;
+use humhub\modules\friendship\Module as FriendshipModule;
 use humhub\modules\user\models\User;
 use humhub\modules\search\events\SearchAddEvent;
 use humhub\modules\space\models\Space;
@@ -281,7 +282,8 @@ public function beforeDelete()
 
     public function getVisibilityTitle()
     {
-        if (Yii::$app->getModule('friendship')->getIsEnabled() && $this->content->container instanceof User) {
+        $module = Yii::$app->getModule('friendship');
+        if ($module instanceof FriendshipModule && $module->isFriendshipEnabled() && $this->content->container instanceof User) {
             if ($this->content->container->isCurrentuser()) {
                 $privateText =  Yii::t('CfilesModule.base', 'This folder is only visible for you and your friends.');
             } else {

diff --git a/module.json b/module.json
@@ -11,7 +11,7 @@
     ],
     "version": "0.16.3",
     "humhub": {
-        "minVersion": "1.14"
+        "minVersion": "1.16"
     },
     "homepage": "https://github.com/humhub/cfiles",
     "authors": [