mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 17:53:41 +01:00
Fix CDN_HOST not affected on full_asset_url (#18662)
* Fix CDN_HOST not affected to assets url * Fix typo
This commit is contained in:
parent
65ad589848
commit
6c2d3038f4
1 changed files with 5 additions and 1 deletions
|
@ -16,7 +16,11 @@ module RoutingHelper
|
||||||
def full_asset_url(source, **options)
|
def full_asset_url(source, **options)
|
||||||
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
|
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
|
||||||
|
|
||||||
URI.join(root_url, source).to_s
|
URI.join(asset_host, source).to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
def asset_host
|
||||||
|
Rails.configuration.action_controller.asset_host || root_url
|
||||||
end
|
end
|
||||||
|
|
||||||
def full_pack_url(source, **options)
|
def full_pack_url(source, **options)
|
||||||
|
|
Loading…
Reference in a new issue