mirror of https://github.com/tootsuite/mastodon
Use URI.join for generate asset URL (#2741)
* Use URI.join for generate asset URL * to Stringpull/1506/merge
parent
2b9bc9c154
commit
2ab7dc9a55
|
@ -12,6 +12,6 @@ module RoutingHelper
|
|||
end
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue