github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: If a user is deleted, don't break embedded comments for admins.

Browse Source
This commit is contained in:
Robin Ward
2014-06-18 17:39:12 -04:00
parent 08b8cacdb0
commit 60cb5ea6a9
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/embed_controller.rb
View File

@ -13,7 +13,13 @@ class EmbedController < ApplicationController
topic_id = TopicEmbed.topic_id_for_embed(embed_url)
if topic_id
@topic_view = TopicView.new(topic_id, current_user, limit: SiteSetting.embed_post_limit, exclude_first: true)
@topic_view = TopicView.new(topic_id,
current_user,
limit: SiteSetting.embed_post_limit,
exclude_first: true,
exclude_deleted_users: true)
@topic_view.posts.reject! {|p| p.user.blank?}
@second_post_url = "#{@topic_view.topic.url}/2" if @topic_view
@posts_left = 0
if @topic_view && @topic_view.posts.size == SiteSetting.embed_post_limit