diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-26 16:50:18 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-26 16:50:18 +0100 |
| commit | 2c7abe1b5682d287b19dde5900087908c976109c (patch) | |
| tree | 316fd5e248c5f112555db52b27a20345f5099c87 /actionpack/lib | |
| parent | 932dffc559ef188eb31d0223116e9da361833488 (diff) | |
| download | rails-2c7abe1b5682d287b19dde5900087908c976109c.tar.gz rails-2c7abe1b5682d287b19dde5900087908c976109c.tar.bz2 rails-2c7abe1b5682d287b19dde5900087908c976109c.zip | |
Fixed bug with asset timestamping when using relative_url_root (Joe Goldwasser) [#1265 status:committed]
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
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 93d38eb929..8bbe74b7ef 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -588,8 +588,8 @@ module ActionView source += ".#{extension}" if missing_extension?(source) unless source =~ ProtocolRegexp source = "/#{directory}/#{source}" unless source[0] == ?/ - source = prepend_relative_url_root(source) source = rewrite_asset_path(source) + source = prepend_relative_url_root(source) end source = prepend_asset_host(source) source |