github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 11:58:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Topic links onebox differently if end in /

Browse Source
This commit is contained in:
Vinoth Kannan
2017-11-02 02:47:36 +05:30
committed by Vinoth Kanan
parent 0a69f2bc77
commit 230fec68ca
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/onebox/engine/discourse_local_onebox.rb
View File

@ -12,8 +12,7 @@ module Onebox
url = other.to_s
return false unless url[Discourse.base_url]
path = url.sub(Discourse.base_url, "")
route = Rails.application.routes.recognize_path(path)
route = Discourse.route_for(url)
!!(route[:controller] =~ /topics|uploads/)
rescue ActionController::RoutingError
@ -21,8 +20,9 @@ module Onebox
end
def to_html
path = @url.sub(Discourse.base_url, "")
route = Rails.application.routes.recognize_path(path)
uri = URI(@url)
path = uri.path || ""
route = Discourse.route_for(uri)
case route[:controller]
when "uploads" then upload_html(path)