aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/asset_tag_helper.rb
diff options
context:
space:
mode:
authorMartin Rehfeld <martin.rehfeld@glnetworks.de>2008-09-22 13:23:23 -0500
committerJoshua Peek <josh@joshpeek.com>2008-09-22 13:23:23 -0500
commit10380a22a65d93bee6775a0ffe93071b798bf249 (patch)
treeddcf661c8c3054653c694291a95a2f9297004bd3 /actionpack/lib/action_view/helpers/asset_tag_helper.rb
parent900fd6eca9dd97d2341e89bcb27d7a82d62965bf (diff)
downloadrails-10380a22a65d93bee6775a0ffe93071b798bf249.tar.gz
rails-10380a22a65d93bee6775a0ffe93071b798bf249.tar.bz2
rails-10380a22a65d93bee6775a0ffe93071b798bf249.zip
Fixed AssetTag cache with with relative_url_root [#1022 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb')
-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 fb711e7c3f..63ccde393a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -601,7 +601,7 @@ module ActionView
def prepend_relative_url_root(source)
relative_url_root = ActionController::Base.relative_url_root
- if request? && source !~ %r{^#{relative_url_root}/}
+ if request? && @include_host && source !~ %r{^#{relative_url_root}/}
"#{relative_url_root}#{source}"
else
source