diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-03 10:56:15 -0700 |
| commit | 11161e6c96fb6686a33e05ead106b96089ff9790 (patch) | |
| tree | 35d5618f1a866ce8ba11efd8e6851d2fd7bbf5fc /actionpack/lib/action_view/helpers.rb | |
| parent | 4996d1a445acd965d0064500ad00d692a742f669 (diff) | |
| parent | 467d251c3dcbd3e4dd1e785a21d63535b795a64c (diff) | |
| download | rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.gz rails-11161e6c96fb6686a33e05ead106b96089ff9790.tar.bz2 rails-11161e6c96fb6686a33e05ead106b96089ff9790.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb index a50c180f63..ba3bdd0d18 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -29,16 +29,13 @@ module ActionView #:nodoc: autoload :TranslationHelper autoload :UrlHelper - def self.included(base) - base.extend(ClassMethods) - end + extend ActiveSupport::Concern - module ClassMethods - include SanitizeHelper::ClassMethods + included do + extend SanitizeHelper::ClassMethods end include ActiveSupport::Benchmarkable - include ActiveModelHelper include AssetTagHelper include AtomFeedHelper |