Skip to content

Commit 8d97f79

Browse files
authored
Fix error after deleting a user from system (#344)
1 parent 9f667d2 commit 8d97f79

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

Events.php

+5
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public static function onIntegrityCheck($event)
5757
$messageEntry->delete();
5858
}
5959
}
60+
if(!$messageEntry->message) {
61+
if ($integrityController->showFix("Deleting message entry id " . $messageEntry->id . " without existing conversation!")) {
62+
$messageEntry->delete();
63+
}
64+
}
6065
}
6166

6267
$integrityController->showTestHeadline("Mail Module (" . UserMessage::find()->count() . " user message entries)");

docs/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
=========
33

4+
3.0.1 (Unreleased)
5+
----------------------
6+
- Fix #343: Fix error after deleting a user from system
7+
48
3.0.0 (July 26, 2023)
59
----------------------
610
- Fix #312: Visibility of scroll down button

models/AbstractMessageEntry.php

+9-7
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,15 @@ public function afterSave($insert, $changedAttributes)
144144
*/
145145
public function afterDelete()
146146
{
147-
foreach ($this->message->users as $user) {
148-
Yii::$app->live->send(new UserMessageDeleted([
149-
'contentContainerId' => $user->contentcontainer_id,
150-
'message_id' => $this->message_id,
151-
'entry_id' => $this->id,
152-
'user_id' => $user->id
153-
]));
147+
if ($this->message instanceof Message) {
148+
foreach ($this->message->users as $user) {
149+
Yii::$app->live->send(new UserMessageDeleted([
150+
'contentContainerId' => $user->contentcontainer_id,
151+
'message_id' => $this->message_id,
152+
'entry_id' => $this->id,
153+
'user_id' => $user->id
154+
]));
155+
}
154156
}
155157

156158
parent::afterDelete();

module.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"messenger",
99
"communication"
1010
],
11-
"version": "3.0.0",
11+
"version": "3.0.1",
1212
"humhub": {
1313
"minVersion": "1.14"
1414
},

0 commit comments

Comments
 (0)