diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-02-10 16:45:39 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-02-10 16:51:30 +0100 |
commit | 1814298d7590988d354955efdb0bc495b359293b (patch) | |
tree | 8592b94b8ba65f2b325466ef933cb4dc7950b9f8 /actionpack/lib/action_view/helpers.rb | |
parent | 89a5f1463d7e9546ed7a0cf482afea99ba2040e7 (diff) | |
download | rails-1814298d7590988d354955efdb0bc495b359293b.tar.gz rails-1814298d7590988d354955efdb0bc495b359293b.tar.bz2 rails-1814298d7590988d354955efdb0bc495b359293b.zip |
Removed Array#safe_join in AS core_ext and moved it to a view helper with the same same. This also changes how safe_join works, if items or the separator are not html_safe they are html_escape'd, a html_safe string is always returned.
Signed-off-by: José Valim <jose.valim@gmail.com>
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 41013c800c..d338ce616a 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -18,7 +18,7 @@ module ActionView #:nodoc: autoload :JavaScriptHelper, "action_view/helpers/javascript_helper" autoload :NumberHelper autoload :PrototypeHelper - autoload :RawOutputHelper + autoload :OutputSafetyHelper autoload :RecordTagHelper autoload :SanitizeHelper autoload :ScriptaculousHelper @@ -48,7 +48,7 @@ module ActionView #:nodoc: include JavaScriptHelper include NumberHelper include PrototypeHelper - include RawOutputHelper + include OutputSafetyHelper include RecordTagHelper include SanitizeHelper include ScriptaculousHelper |