aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorthedarkone <thedarkone2@gmail.com>2010-09-26 14:45:27 +0200
committerthedarkone <thedarkone2@gmail.com>2010-09-27 17:46:00 +0200
commitdc09cc055ab79ec8181ec4089449c94759700e51 (patch)
treeb36bbec59cfcf86065d8958dc6cd368e0e344e2b /actionpack/lib/action_view
parentbb47927d914480218b003d322c8e8ebcd388093e (diff)
downloadrails-dc09cc055ab79ec8181ec4089449c94759700e51.tar.gz
rails-dc09cc055ab79ec8181ec4089449c94759700e51.tar.bz2
rails-dc09cc055ab79ec8181ec4089449c94759700e51.zip
Assume compute_asset_host returns reasonable values.
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index efd238c692..c1dfbe5dc3 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -718,7 +718,7 @@ module ActionView
def rewrite_host_and_protocol(source, has_request)
host = compute_asset_host(source)
- if has_request && host.present? && !is_uri?(host)
+ if has_request && host && !is_uri?(host)
host = "#{controller.request.protocol}#{host}"
end
"#{host}#{source}"