diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-27 12:50:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-27 12:50:47 +0000 |
| commit | ca807c8d928497bc8c68310bd852a2b85c83e975 (patch) | |
| tree | 72a879448950096042fd60e25fc3f0d96122c09b | |
| parent | d06f4d013d32465d63c33f436337064d88ccbf6c (diff) | |
| download | redmine-ca807c8d928497bc8c68310bd852a2b85c83e975.tar.gz redmine-ca807c8d928497bc8c68310bd852a2b85c83e975.zip | |
Fixes wiki diff rendering.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4953 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/wiki/diff.rhtml | 2 | ||||
| -rw-r--r-- | 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 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 |