diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-08-21 19:42:16 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-21 12:42:16 +0200 |
| commit | 10e9a9a3f9969dc5d83238b24f46fa96b28c3c0b (patch) | |
| tree | a4ea0ec38f3557b11060e088eb74b05ed49888fd /app/helpers | |
| parent | 6e9eda53319bc970b085c7c55277981320b2a835 (diff) | |
Use URI.join even when S3 enabled (#4652)
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/routing_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 8126176ba..1fbf77ec3 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -12,6 +12,8 @@ module RoutingHelper end def full_asset_url(source, options = {}) - Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source, options)).to_s + source = ActionController::Base.helpers.asset_url(source, options) unless Rails.configuration.x.use_s3 + + URI.join(root_url, source).to_s end end |