From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Feb 2011 12:50:47 +0000 (+0000)
Subject: Fixes wiki diff rendering.
X-Git-Tag: 1.2.0~870
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ca807c8d928497bc8c68310bd852a2b85c83e975;p=redmine.git

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 11afc5930..a1006dce3 100644
--- 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 24deb3d6d..b634d5f1f 100644
--- 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