jro_apps/redmine Commit - r3697:6eea3300f88a

Sanitize image links and handle nils in the toc formatter. #5445...

Eric Davis -

r3697:6eea3300f88a

parent child

Context file:

r3697:6eea3300f88a

lib/redmine/wiki_formatting/textile/formatter.rb +3 -1

                       toc_item = content.gsub(/(\[\[([^\]\|]*)(\|([^\]]*))?\]\])/) { $4 || $2 }
                       # sanitizes titles from links
                       # see redcloth3.rb, same as "#{pre}#{text}#{post}"
-                      toc_item.gsub!(LINK_RE) { $2+$4+$9 }
+                      toc_item.gsub!(LINK_RE) { [$2, $4, $9].join }
+                      # sanitizes image links from titles
+                      toc_item.gsub!(IMAGE_RE) { [$5].join }
                       # removes styles
                       # eg. %{color:red}Triggers% => Triggers
                       toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'

test/unit/helpers/application_helper_test.rb +5 -1

             h1. Another title
             h2. An "Internet link":http://www.redmine.org/ inside subtitle
+            h2. "Project Name !/attachments/1234/logo_small.gif! !/attachments/5678/logo_2.png!":/projects/projectname/issues
             RAW
                 expected = '<ul class="toc">' +
                            '<li class="heading2"><a href="#Subtitle-with-red-text">Subtitle with red text</a></li>' +
                            '<li class="heading1"><a href="#Another-title">Another title</a></li>' +
                            '<li class="heading2"><a href="#An-Internet-link-inside-subtitle">An Internet link inside subtitle</a></li>' +
+                           '<li class="heading2"><a href="#Project-Name">Project Name</a></li>' +
                            '</ul>'
                 assert textilizable(raw).gsub("\n", "").include?(expected)
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages