diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-20 07:54:55 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-20 07:54:55 +0000 |
| commit | 7f26415d3c0e4101ce1569a499470e8a32dbfede (patch) | |
| tree | bd1b1db0161dea64945daca530acbf3d09e13cc9 /actionpack/lib/action_view/helpers/asset_tag_helper.rb | |
| parent | 47292cdef7fe9ca21c749c7fe594457ee1c81de6 (diff) | |
| download | rails-7f26415d3c0e4101ce1569a499470e8a32dbfede.tar.gz rails-7f26415d3c0e4101ce1569a499470e8a32dbfede.tar.bz2 rails-7f26415d3c0e4101ce1569a499470e8a32dbfede.zip | |
Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]. Added assert_dom_equal and assert_dom_not_equal to compare tags generated by the helpers in an order-indifferent manner #1995 [skae]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2271 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb')
| -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 fea7abe3f9..efde8fa51b 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -121,7 +121,7 @@ module ActionView def compute_public_path(source, dir, ext) source = "/#{dir}/#{source}" unless source.first == "/" || source.include?(":") source = "#{source}.#{ext}" unless source.include?(".") - source = "#{@request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source + source = "#{@controller.request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source ActionController::Base.asset_host + source end end |