oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle the case when a friend approve message no longer exist.

Browse source
This commit is contained in:
Colin Kuskie 2012-07-10 16:12:29 -07:00
parent 7a6ee77a06
commit a3f5b3ae6c
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -24,6 +24,7 @@
- fixed #12345: tickets in trash still show up - fixed #12345: tickets in trash still show up
- fixed #12305: dbSlave breaks WebGUI when not able to connect - fixed #12305: dbSlave breaks WebGUI when not able to connect
- fixed: Http Proxy assets with no URL to proxy cannot be deleted. - fixed: Http Proxy assets with no URL to proxy cannot be deleted.
- fixed: Friends request messages that no longer exist throw a warning.
7.10.24 7.10.24
- fixed #12318: asset error causes asset manager to fail - fixed #12318: asset error causes asset manager to fail

5
lib/WebGUI/Friends.pm
View file

@ -96,7 +96,10 @@ sub approveAddRequest {
status => 'unread', status => 'unread',
sentBy => $self->user->userId, sentBy => $self->user->userId,
}); });
$inbox->getMessage($invite->{messageId})->setStatus('completed'); my $message = $inbox->getMessage($invite->{messageId});
if ($message) {
$message->setStatus('completed');
}
$db->deleteRow("friendInvitations", "inviteId", $inviteId); $db->deleteRow("friendInvitations", "inviteId", $inviteId);
} }