diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-20 16:57:23 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-20 16:57:23 -0300 |
| commit | 9a28bd787660b08aae36155066e61d3608d0b4dd (patch) | |
| tree | 2d10dd32ad28cc070c3d142c45d6a35fcd5ae43e /actionpack/lib/action_view/helpers.rb | |
| parent | b326faef0936e5a845d1f6eb9ed2200babfd05f8 (diff) | |
| parent | 37658f15bb88e054635a496327a4a82bb50fd5d5 (diff) | |
| download | rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.gz rails-9a28bd787660b08aae36155066e61d3608d0b4dd.tar.bz2 rails-9a28bd787660b08aae36155066e61d3608d0b4dd.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb index 97fa2d80e9..c1c0eb59ae 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -1,6 +1,6 @@ module ActionView #:nodoc: module Helpers #:nodoc: - autoload :ActiveRecordHelper, 'action_view/helpers/active_record_helper' + autoload :ActiveModelHelper, 'action_view/helpers/active_model_helper' autoload :AssetTagHelper, 'action_view/helpers/asset_tag_helper' autoload :AtomFeedHelper, 'action_view/helpers/atom_feed_helper' autoload :BenchmarkHelper, 'action_view/helpers/benchmark_helper' @@ -31,7 +31,7 @@ module ActionView #:nodoc: include SanitizeHelper::ClassMethods end - include ActiveRecordHelper + include ActiveModelHelper include AssetTagHelper include AtomFeedHelper include BenchmarkHelper |