From ab811b6ab929d3f220e060c15c49bc075d91e5f2 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 20 Jun 2016 18:33:01 -0300 Subject: Render references for labels that name contains ?, or & --- lib/banzai/filter/label_reference_filter.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb index e4d3f87d0aa..7d016d78669 100644 --- a/lib/banzai/filter/label_reference_filter.rb +++ b/lib/banzai/filter/label_reference_filter.rb @@ -13,13 +13,13 @@ module Banzai end def self.references_in(text, pattern = Label.reference_pattern) - text.gsub(pattern) do |match| + unescape_html_entities(text).gsub(pattern) do |match| yield match, $~[:label_id].to_i, $~[:label_name], $~[:project], $~ end end def references_in(text, pattern = Label.reference_pattern) - text.gsub(pattern) do |match| + unescape_html_entities(text).gsub(pattern) do |match| label = find_label($~[:project], $~[:label_id], $~[:label_name]) if label @@ -66,6 +66,10 @@ module Banzai LabelsHelper.render_colored_cross_project_label(object) end end + + def unescape_html_entities(text) + LabelsHelper.unescape_html_entities(text) + end end end end -- cgit v1.2.1 From d6b60e83edb755347c56e38770fcdffab9edbfa0 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 27 Jun 2016 17:08:39 -0300 Subject: Move `unescape_html_entities` from LabelsHelper to Label model --- lib/banzai/filter/label_reference_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb index 7d016d78669..fdd4afce606 100644 --- a/lib/banzai/filter/label_reference_filter.rb +++ b/lib/banzai/filter/label_reference_filter.rb @@ -68,7 +68,7 @@ module Banzai end def unescape_html_entities(text) - LabelsHelper.unescape_html_entities(text) + text.to_s.gsub(/(>)|(<)|(&)/, Label::TABLE_FOR_ESCAPE_HTML_ENTITIES.invert) end end end -- cgit v1.2.1 From 5d11cf2e98156c7fff403c3d8375da6f9b7edbf3 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Wed, 29 Jun 2016 17:47:37 -0300 Subject: Use CGI.unescapeHTML rather than doing the gsub with a map --- lib/banzai/filter/label_reference_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb index fdd4afce606..e258dc8e2bf 100644 --- a/lib/banzai/filter/label_reference_filter.rb +++ b/lib/banzai/filter/label_reference_filter.rb @@ -68,7 +68,7 @@ module Banzai end def unescape_html_entities(text) - text.to_s.gsub(/(>)|(<)|(&)/, Label::TABLE_FOR_ESCAPE_HTML_ENTITIES.invert) + CGI.unescapeHTML(text.to_s) end end end -- cgit v1.2.1