diff options
| author | Erik Michaels-Ober <sferik@gmail.com> | 2011-12-12 14:05:25 -0800 |
|---|---|---|
| committer | Erik Michaels-Ober <sferik@gmail.com> | 2011-12-12 14:05:25 -0800 |
| commit | 196407c54f0736c275d2ad4e6f8b0ac55360ad95 (patch) | |
| tree | d589c62470b09e2166a95c9df1592cc87ad8c318 | |
| parent | 9147613ce09710e70790ac45d3b20c3ef6c1fa46 (diff) | |
| download | rails-196407c54f0736c275d2ad4e6f8b0ac55360ad95.tar.gz rails-196407c54f0736c275d2ad4e6f8b0ac55360ad95.tar.bz2 rails-196407c54f0736c275d2ad4e6f8b0ac55360ad95.zip | |
Include TagHelper but don't explicitly require it
Allow autoloading to work as intended and avoid multiple requires.
| -rw-r--r-- | actionpack/lib/action_view/helpers/sanitize_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb index bcc8f6fbcb..7768c8c151 100644 --- a/actionpack/lib/action_view/helpers/sanitize_helper.rb +++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb @@ -1,6 +1,5 @@ require 'active_support/core_ext/object/try' require 'action_controller/vendor/html-scanner' -require 'action_view/helpers/tag_helper' module ActionView # = Action View Sanitize Helpers diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index bc8572fe69..209360ee82 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -1,6 +1,5 @@ require 'active_support/core_ext/object/blank' require 'active_support/core_ext/string/filters' -require 'action_view/helpers/tag_helper' module ActionView # = Action View Text Helpers @@ -31,6 +30,7 @@ module ActionView extend ActiveSupport::Concern include SanitizeHelper + include TagHelper # The preferred method of outputting text in your views is to use the # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods # do not operate as expected in an eRuby code block. If you absolutely must |