summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-27 23:02:52 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-27 23:02:52 +0000
commit333a94d413acc797328950fc1bb88ed962893854 (patch)
tree868feb7d3626fc5262db39c1b09b4496f258fcb2
parent0db87ae9cafa796d9b7837c8a2ae5dd43919ab07 (diff)
Don't unescape HTML in HtmlFormatter. Submitted by Kent Sibilev
<ksruby at gmail.com>. [ruby-core:08392]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/ri/ri_formatter.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c31c9fc9a0..5c86ce4e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 28 07:53:44 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
+ Submitted by Kent Sibilev <ksruby at gmail.com>. [ruby-core:08392].
+
Mon Aug 28 07:25:45 2006 Eric Hodel <drbrain@segment7.net>
* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
diff --git a/lib/rdoc/ri/ri_formatter.rb b/lib/rdoc/ri/ri_formatter.rb
index 56a1fb4665..34eb561ca3 100644
--- a/lib/rdoc/ri/ri_formatter.rb
+++ b/lib/rdoc/ri/ri_formatter.rb
@@ -554,9 +554,7 @@ module RI
def display_verbatim_flow_item(item, prefix=@indent)
print("<pre>")
- item.body.split(/\n/).each do |line|
- puts conv_html(line)
- end
+ puts item.body
puts("</pre>")
end