mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 22:20:21 +02:00
Code Issues Releases Wiki Activity

Fix error when replying to a post by a deleted user

Browse Source
This commit is contained in:
Toby Zerner
2015-10-19 16:18:26 +10:30
parent 4d5a291d76
commit 49ed9c7dde
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/mentions/js/forum/src/addPostReplyAction.js
View File

@@ -10,7 +10,8 @@ export default function() {
if (post.isHidden() || (app.session.user && !post.discussion().canReply())) return; if (post.isHidden() || (app.session.user && !post.discussion().canReply())) return;
function insertMention(component, quote) { function insertMention(component, quote) {
const mention = '@' + post.user().username() + '#' + post.id() + ' '; const user = post.user();
const mention = '@' + (user ? user.username() : post.number()) + '#' + post.id() + ' ';
// If the composer is empty, then assume we're starting a new reply. // If the composer is empty, then assume we're starting a new reply.
// In which case we don't want the user to have to confirm if they // In which case we don't want the user to have to confirm if they

2
extensions/mentions/src/Listener/UpdatePostMentionsMetadata.php
View File

@@ -129,7 +129,7 @@ class UpdatePostMentionsMetadata
->whereIn('id', $mentioned) ->whereIn('id', $mentioned)
->get() ->get()
->filter(function ($post) use ($reply) { ->filter(function ($post) use ($reply) {
return $post->user->id !== $reply->user->id; return $post->user && $post->user->id !== $reply->user_id;
}) })
->all(); ->all();