nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use URI.join for generate asset URL (#2741) 

* Use URI.join for generate asset URL

* to String
This commit is contained in:
Yamagishi Kazutoshi 2017-05-03 18:31:21 +09:00 committed by Eugen Rochko
parent 2b9bc9c154
commit 2ab7dc9a55
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/routing_helper.rb
View File

@ -12,6 +12,6 @@ module RoutingHelper
end end
def full_asset_url(source) def full_asset_url(source)
Rails.configuration.x.use_s3 ? source : File.join(root_url, ActionController::Base.helpers.asset_url(source)) Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source)).to_s
end end
end end