mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2022-11-11 11:00:28 +01:00
commit 6efa461557
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ HumHub Changelog
- Fix #5877: Fix wrong empty profile stream message
- Fix #5874: Fix adding licence key after removing it from marketplace
- Enh #5891: Improve select2 width on people filters
- Enh #5906: Allow Space Invites with empty originator
- Fix #5909: Fix optional parameter on ldap user searching
1.12.1 (August 15, 2022)

10
protected/humhub/modules/space/behaviors/SpaceModelMembership.php
View File

@ -425,9 +425,13 @@ class SpaceModelMembership extends Behavior
$userInvite = Invite::findOne(['email' => $user->email]);
if ($userInvite !== null && $userInvite->source == Invite::SOURCE_INVITE && !$silent) {
InviteAccepted::instance()->from($user)->about($this->owner)
->send(User::findOne(['id' => $userInvite->user_originator_id]));
if ($userInvite !== null &&
!empty($userInvite->user_originator_id) &&
$userInvite->source == Invite::SOURCE_INVITE && !$silent) {
$originator = User::findOne(['id' => $userInvite->user_originator_id]);
if ($originator !== null) {
InviteAccepted::instance()->from($user)->about($this->owner)->send($originator);
}
}
} else {
// User is already member