diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-12 14:11:16 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-12 14:11:16 -0800 |
| commit | 400929fb44ce58db3bebcaf4f685c3cd0eb2b739 (patch) | |
| tree | 3398bec3938f345fb4319222a73d020cbfacd7b9 /actionpack/lib | |
| parent | ffa8bfeed91a10c3566a95d159645fa20f75c429 (diff) | |
| parent | 196407c54f0736c275d2ad4e6f8b0ac55360ad95 (diff) | |
| download | rails-400929fb44ce58db3bebcaf4f685c3cd0eb2b739.tar.gz rails-400929fb44ce58db3bebcaf4f685c3cd0eb2b739.tar.bz2 rails-400929fb44ce58db3bebcaf4f685c3cd0eb2b739.zip | |
Merge pull request #3943 from sferik/add_explicit_requires
Include TagHelper but don't explicitly require it
Diffstat (limited to 'actionpack/lib')
| -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 |