diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-29 11:00:56 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-29 11:00:56 +0200 |
| commit | f72dc7f7798f521d20a71fb465df57f0d66befb5 (patch) | |
| tree | 8664653f0cc6f9aec71d9d02f578cdf863893785 | |
| parent | 1c931fb81477397929a31a6b95c5d65b6d582182 (diff) | |
| download | gitlab-ce-f72dc7f7798f521d20a71fb465df57f0d66befb5.tar.gz | |
dont escape images inside links for gfm. Fixes #2701
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 111982e9147..1a3d34eb886 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -13,7 +13,13 @@ module GitlabMarkdownHelper def link_to_gfm(body, url, html_options = {}) return "" if body.blank? - gfm_body = gfm(escape_once(body), html_options) + escaped_body = if body =~ /^\<img/ + body + else + escape_once(body) + end + + gfm_body = gfm(escaped_body, html_options) gfm_body.gsub!(%r{<a.*?>.*?</a>}m) do |match| "</a>#{match}#{link_to("", url, html_options)[0..-5]}" # "</a>".length +1 |