Merge remote branch 'tim'

timcharper · Nov 5, 2009 · 8ce1189 · 8ce1189
2 parents 64d1aa9 + 8005e3a
commit 8ce1189
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Support/app/views/commit/_commit_result.html.erb b/Support/app/views/commit/_commit_result.html.erb
@@ -10,7 +10,7 @@
 </ul>
 
 <h2>Using Message:</h2>
-<pre><%= htmlize(message) %></pre>
+<pre style="white-space: pre-wrap;"><%= htmlize_attr(message) %></pre>
 
 <% if result[:rev] %>
   <h2>Diff of committed changes:</h2>

diff --git a/Support/tmvc/lib/format_helpers/tag_helper.rb b/Support/tmvc/lib/format_helpers/tag_helper.rb
@@ -54,7 +54,7 @@ def tag_options(options, escape = true)
     end
 
     def htmlize_attr(str)
-      str.to_s.gsub(/"/, "&quot;").gsub("<", "&lt;").gsub(">", "&gt;")
+      str.to_s.gsub(/&/, "&amp;").gsub(/"/, "&quot;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
 
     alias :escape_once :htmlize_attr