summaryrefslogtreecommitdiffstats
path: root/app/helpers/journals_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-17 22:02:31 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-17 22:02:31 +0000
commit8269e9a990cd70e2bb3dc4a441404c55f8bf528b (patch)
treefdb1c0c676abbfc9ef60d94e308bd9a618ec298f /app/helpers/journals_helper.rb
parenta42ea3ccbbf6ec46884e00f7eee9aae59b01849a (diff)
downloadredmine-8269e9a990cd70e2bb3dc4a441404c55f8bf528b.tar.gz
redmine-8269e9a990cd70e2bb3dc4a441404c55f8bf528b.zip
html_safe for Rails3
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8269 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/journals_helper.rb')
-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 929ea4acb..2bf9519a6 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -34,7 +34,7 @@ module JournalsHelper
content << textilizable(journal, :notes)
css_classes = "wiki"
css_classes << " editable" if editable
- content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
+ content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
end
def link_to_in_place_notes_editor(text, field_id, url, options={})