summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-02 15:06:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-02 15:06:29 +0000
commit324b904ed511eb4de1fe7d73a0299cedfa9e6d62 (patch)
tree238dae74abffb054ff19c3f48c38b7aea3168cfe /app
parentb1cafef07a1b29b60af41d071f785c781db965bc (diff)
downloadredmine-324b904ed511eb4de1fe7d73a0299cedfa9e6d62.tar.gz
redmine-324b904ed511eb4de1fe7d73a0299cedfa9e6d62.zip
Fix: Inline image links broken in rev 690.
TODO: Fix urls with & git-svn-id: http://redmine.rubyforge.org/svn/trunk@698 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 93f319997..550ce3c59 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -177,7 +177,7 @@ module ApplicationHelper
# finally textilize text
@do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
- text = @do_textilize ? RedCloth.new(auto_link(text), [:hard_breaks]).to_html : simple_format(auto_link(h(text)))
+ text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))
end
# Same as Rails' simple_format helper without using paragraphs