From 8b4c8e6902efc0001c3b9202a4ff74225dfbf018 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Feb 2011 12:50:47 +0000
Subject: [PATCH] Fixes wiki diff rendering.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4953 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/diff.rhtml   | 2 +-
 lib/redmine/helpers/diff.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
index 11afc593..a1006dce 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 24deb3d6..b634d5f1 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