mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 06:08:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2555: Friendship notification category visible even if friendship system deactivated

Browse Source
This commit is contained in:
buddh4 2017-06-07 15:38:09 +02:00
parent 7d1a321767
commit a928988195
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protected/humhub/docs/CHANGELOG.md
View File

@ -21,6 +21,7 @@ HumHub Change Log
- Fix: Invite Users does not respect ManageUsers/ManageGroups permission - Fix: Invite Users does not respect ManageUsers/ManageGroups permission
- Fix: Mail summaries sent in incorrect language - Fix: Mail summaries sent in incorrect language
- Fix: Send button text on request space membership dialog - Fix: Send button text on request space membership dialog
- Fix #2555: Friendship notification category visible even if friendship system deactivated
1.2.0 (April 16, 2017) 1.2.0 (April 16, 2017)
-------------------------------- --------------------------------

9
protected/humhub/modules/friendship/notifications/FriendshipNotificationCategory.php
View File

@ -8,6 +8,7 @@
namespace humhub\modules\friendship\notifications; namespace humhub\modules\friendship\notifications;
use humhub\modules\user\models\User;
use Yii; use Yii;
use humhub\modules\notification\components\NotificationCategory; use humhub\modules\notification\components\NotificationCategory;
use humhub\modules\notification\targets\BaseTarget; use humhub\modules\notification\targets\BaseTarget;
@ -61,4 +62,12 @@ class FriendshipNotificationCategory extends NotificationCategory
return $target->defaultSetting; return $target->defaultSetting;
} }
/**
* @inheritdoc
*/
public function isVisible(User $user = null)
{
return Yii::$app->getModule('friendship')->getIsEnabled();
}
} }