From: Jean-Philippe Lang Date: Wed, 4 Nov 2009 09:57:11 +0000 (+0000) Subject: Merged r2924 from trunk. X-Git-Tag: 0.8.6~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eaf0ea0c23bfd7d3aadda606b3866212a5009a9b;p=redmine.git Merged r2924 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2995 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml index 6e6ad0f88..94c710ebd 100644 --- a/app/views/journals/_notes_form.rhtml +++ b/app/views/journals/_notes_form.rhtml @@ -1,6 +1,6 @@ <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %> - <%= text_area_tag :notes, h(@journal.notes), :class => 'wiki-edit', - :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %> + <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', + :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %> <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>

<%= submit_tag l(:button_save) %> <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +