aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2011-12-11 15:56:21 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-12-11 15:56:21 -0700
commit9147613ce09710e70790ac45d3b20c3ef6c1fa46 (patch)
treeb10d44439f3defe1aba04a81de19c5244968be7e
parent63cd9432265a32d222353b535d60333c2a6a5125 (diff)
downloadrails-9147613ce09710e70790ac45d3b20c3ef6c1fa46.tar.gz
rails-9147613ce09710e70790ac45d3b20c3ef6c1fa46.tar.bz2
rails-9147613ce09710e70790ac45d3b20c3ef6c1fa46.zip
Remove duplicate html_escape docs
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c58ea16b44..c6d861d124 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -26,16 +26,7 @@ class ERB
end
end
else
- # A utility method for escaping HTML tag characters.
- # This method is also aliased as <tt>h</tt>.
- #
- # In your ERB templates, use this method to escape any unsafe content. For example:
- # <%=h @person.name %>
- #
- # ==== Example:
- # puts html_escape("is a > 0 & a < 10?")
- # # => is a &gt; 0 &amp; a &lt; 10?
- def html_escape(s)
+ def html_escape(s) #:nodoc:
s = s.to_s
if s.html_safe?
s