summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-01 06:39:35 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-01 06:39:35 +0000
commit2b2eeb019243de6758d6cd96bf1c7c92abcd39ae (patch)
treeec4776b3ae6f9d556045676c8b1c7320f17c5f5b /app/helpers
parent48fae144032d88e592eac30e8711278073f0ed42 (diff)
downloadredmine-2b2eeb019243de6758d6cd96bf1c7c92abcd39ae.tar.gz
redmine-2b2eeb019243de6758d6cd96bf1c7c92abcd39ae.zip
Rails3: helper: html_safe for JournalsHelper render_notes method
Contributed by Sernin van de Krol. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8451 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/journals_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 2bf9519a6..958bde9a3 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -30,7 +30,7 @@ module JournalsHelper
{ :controller => 'journals', :action => 'edit', :id => journal },
:title => l(:button_edit)) if editable
end
- content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
+ content << content_tag('div', links.join(' ').html_safe, :class => 'contextual') unless links.empty?
content << textilizable(journal, :notes)
css_classes = "wiki"
css_classes << " editable" if editable