github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-10 18:03:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: If a topic/post cannot be oneboxed, don't swallow the href.

Browse Source
This commit is contained in:
Robin Ward
2013-08-24 15:08:36 -04:00
parent 20e8a8a38a
commit 2ce59d2585
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/oneboxer/discourse_local_onebox.rb
View File

@ -28,12 +28,13 @@ module Oneboxer
@template = 'user' @template = 'user'
when 'topics' when 'topics'
linked = "<a href='#{@url}'>#{@url}</a>"
if route[:post_number].present? && route[:post_number].to_i > 1 if route[:post_number].present? && route[:post_number].to_i > 1
# Post Link # Post Link
post = Post.where(topic_id: route[:topic_id], post_number: route[:post_number].to_i).first post = Post.where(topic_id: route[:topic_id], post_number: route[:post_number].to_i).first
return nil unless post return linked unless post
return linked unless Guardian.new.can_see?(post)
return @url unless Guardian.new.can_see?(post)
topic = post.topic topic = post.topic
slug = Slug.for(topic.title) slug = Slug.for(topic.title)
@ -50,9 +51,8 @@ module Oneboxer
else else
# Topic Link # Topic Link
topic = Topic.where(id: route[:topic_id].to_i).includes(:user).first topic = Topic.where(id: route[:topic_id].to_i).includes(:user).first
return nil unless topic return linked unless topic
return linked unless Guardian.new.can_see?(topic)
return @url unless Guardian.new.can_see?(topic)
post = topic.posts.first post = topic.posts.first