diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
| commit | 514fc908a373306b32b2b6b9fc0d849161d88271 (patch) | |
| tree | 0f0028e424b43dcf4a59b21ccc7170dfe883746b /app/helpers/routing_helper.rb | |
| parent | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (diff) | |
| parent | 11bddd31ce33b654ef72b00221715e6026486e7c (diff) | |
Merge tag 'v1.6.0rc3' into sync/upstream
Diffstat (limited to 'app/helpers/routing_helper.rb')
| -rw-r--r-- | app/helpers/routing_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 1fbf77ec3..f4693358c 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -12,8 +12,14 @@ module RoutingHelper end def full_asset_url(source, options = {}) - source = ActionController::Base.helpers.asset_url(source, options) unless Rails.configuration.x.use_s3 + source = ActionController::Base.helpers.asset_url(source, options) unless use_storage? URI.join(root_url, source).to_s end + + private + + def use_storage? + Rails.configuration.x.use_s3 || Rails.configuration.x.use_swift + end end |