Fix missing protocol in dns-prefetch, improve code style (#8963)

Regression from #8942
2018-10-12 02:19:10 +02:00
parent 5cbbd2c3b5
commit 22de24b8ca
3 changed files with 10 additions and 4 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -83,7 +83,7 @@ module ApplicationHelper
  end

  def cdn_host
-    ENV['CDN_HOST'].presence
+    Rails.configuration.action_controller.asset_host
  end

  def cdn_host?
@ -91,10 +91,10 @@ module ApplicationHelper
  end

  def storage_host
-    ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST'].presence
+    "https://#{ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST']}"
  end

  def storage_host?
-    storage_host.present?
+    ENV['S3_ALIAS_HOST'].present? || ENV['S3_CLOUDFRONT_HOST'].present?
  end
 end