Fixes wiki diff rendering.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4953 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
index 11afc59301387aec4520141d7eb905264504a844..a1006dce342635cf4b1808e7517df554bb275989 100644 (file)
--- a/app/views/wiki/diff.rhtml
+++ b/app/views/wiki/diff.rhtml
@@ -13,5 +13,5 @@
 </p>
 
 <div class="text-diff">
-<%= @diff.to_html %>
+<%= simple_format_without_paragraph @diff.to_html %>
 </div>

diff --git a/lib/redmine/helpers/diff.rb b/lib/redmine/helpers/diff.rb
index 24deb3d6dd92ecc319541f752f69e02c9b1bedc7..b634d5f1f7f296eabf40f2531a8f35035d6a9020 100644 (file)
--- a/lib/redmine/helpers/diff.rb
+++ b/lib/redmine/helpers/diff.rb
@@ -65,7 +65,7 @@ module Redmine
             words_del = 0
           end
         end
-        simple_format(words.join(' '))
+        words.join(' ')
       end
     end
   end