summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-05-02 06:57:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-05-02 06:57:29 +0000
commitbcc5ac38f3b77d050857fd33ee1a6e2d31828399 (patch)
tree53fbf1c2dc98989e4de60af6d754442b1e402c80 /lib
parent9875ed9954c82a656b77b56af27ced25a5da73bb (diff)
downloadredmine-bcc5ac38f3b77d050857fd33ee1a6e2d31828399.tar.gz
redmine-bcc5ac38f3b77d050857fd33ee1a6e2d31828399.zip
Crash in markdown formatter causes ruby process to end (#16781).
Patch by Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@13122 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/wiki_formatting/markdown/formatter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb
index 22c22c82b..a55845147 100644
--- a/lib/redmine/wiki_formatting/markdown/formatter.rb
+++ b/lib/redmine/wiki_formatting/markdown/formatter.rb
@@ -28,7 +28,7 @@ module Redmine
unless link && link.starts_with?('/')
css = 'external'
end
- content_tag('a', content.html_safe, :href => link, :title => title, :class => css)
+ content_tag('a', content.to_s.html_safe, :href => link, :title => title, :class => css)
end
def block_code(code, language)