diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-10 03:58:57 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-10 03:58:57 -0700 |
| commit | 3a611cb207ae69ae2053fc165a2f88e5ad1735b3 (patch) | |
| tree | 70701c44edf284dc9ac0a72a7d289c44ed83a1d9 | |
| parent | c5448721b5054b8a467958d60427fdee15eac604 (diff) | |
| parent | 0ac79d03430fe867f7614b4afe4bac06c3d77f8f (diff) | |
| download | rails-3a611cb207ae69ae2053fc165a2f88e5ad1735b3.tar.gz rails-3a611cb207ae69ae2053fc165a2f88e5ad1735b3.tar.bz2 rails-3a611cb207ae69ae2053fc165a2f88e5ad1735b3.zip | |
Merge pull request #2026 from spohlenz/asset-tag-fix
Include TagHelper within AssetTagHelper
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 0c3f011c92..509c29844a 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -1,6 +1,7 @@ require 'action_view/helpers/asset_tag_helpers/javascript_tag_helpers' require 'action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers' require 'action_view/helpers/asset_tag_helpers/asset_paths' +require 'action_view/helpers/tag_helper' module ActionView # = Action View Asset Tag Helpers @@ -191,6 +192,7 @@ module ActionView # RewriteEngine On # RewriteRule ^/release-\d+/(images|javascripts|stylesheets)/(.*)$ /$1/$2 [L] module AssetTagHelper + include TagHelper include JavascriptTagHelpers include StylesheetTagHelpers # Returns a link tag that browsers and news readers can use to auto-detect |