Fixes wiki diff rendering.

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

Fixes wiki diff rendering.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4953 e93f8b46-1217-0410-a6f0-8f06a7374b81
8b4c8e69 · Jean-Philippe Lang · Eric Davis · 771147ce · 8b4c8e69 · 8b4c8e69
Commit 8b4c8e69 authored Feb 27, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

diff.rhtml app/views/wiki/diff.rhtml +1 -1

diff.rb lib/redmine/helpers/diff.rb +1 -1

No files found.
--- 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>
--- 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