diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-06 18:18:27 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-06 18:18:27 +0000 |
| commit | 4c2fcb08654b201371bd21a065f2368e9cad7547 (patch) | |
| tree | 3b75f5c1693f1af737f762f0cbcf569aa090c112 | |
| parent | 974d6db6dbcb7efa5d3b492005f8932db52ed2f6 (diff) | |
| download | redmine-4c2fcb08654b201371bd21a065f2368e9cad7547.tar.gz redmine-4c2fcb08654b201371bd21a065f2368e9cad7547.zip | |
Fixed that empty Markdown image tag raises en error (#23246).
git-svn-id: http://svn.redmine.org/redmine/trunk@15607 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/helpers/url.rb | 2 | ||||
| -rw-r--r-- | test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/redmine/helpers/url.rb b/lib/redmine/helpers/url.rb index 4177bf23e..0cc149c3b 100644 --- a/lib/redmine/helpers/url.rb +++ b/lib/redmine/helpers/url.rb @@ -23,7 +23,7 @@ module Redmine def uri_with_safe_scheme?(uri, schemes = ['http', 'https', 'ftp', 'mailto', nil]) # URLs relative to the current document or document root (without a protocol # separator, should be harmless - return true unless uri.include? ":" + return true unless uri.to_s.include? ":" # Other URLs need to be parsed schemes.include? URI.parse(uri).scheme diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb index 6222c21cc..b8aa37ff2 100644 --- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb @@ -28,6 +28,10 @@ class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase assert @formatter.new("!>[](foo.png)").to_html end + def test_empty_image_should_not_raise_exception + assert @formatter.new("![]()").to_html + end + # re-using the formatter after getting above error crashes the # ruby interpreter. This seems to be related to # https://github.com/vmg/redcarpet/issues/318 |