BigW Consortium Gitlab

Commit 17e3d3fd by winniehell

Avoid escaping relative links in Markdown twice (!7940)

parent 7a9ba9bb
---
title: Avoid escaping relative links in Markdown twice
merge_request: 7940
author: winniehell
...@@ -46,7 +46,7 @@ module Banzai ...@@ -46,7 +46,7 @@ module Banzai
end end
def rebuild_relative_uri(uri) def rebuild_relative_uri(uri)
file_path = relative_file_path(uri.path) file_path = relative_file_path(uri)
uri.path = [ uri.path = [
relative_url_root, relative_url_root,
...@@ -59,8 +59,10 @@ module Banzai ...@@ -59,8 +59,10 @@ module Banzai
uri uri
end end
def relative_file_path(path) def relative_file_path(uri)
nested_path = build_relative_path(path, context[:requested_path]) path = Addressable::URI.unescape(uri.path)
request_path = Addressable::URI.unescape(context[:requested_path])
nested_path = build_relative_path(path, request_path)
file_exists?(nested_path) ? nested_path : path file_exists?(nested_path) ? nested_path : path
end end
...@@ -108,11 +110,7 @@ module Banzai ...@@ -108,11 +110,7 @@ module Banzai
end end
def uri_type(path) def uri_type(path)
@uri_types[path] ||= begin @uri_types[path] ||= current_commit.uri_type(path)
unescaped_path = Addressable::URI.unescape(path)
current_commit.uri_type(unescaped_path)
end
end end
def current_commit def current_commit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment