jro_apps/redmine Commit - r1004:5f871e965746

Fixed: Textile image with style attribute cause internal server error....

Jean-Philippe Lang -

r1004:5f871e965746

parent child

Context file:

r1004:5f871e965746

app/helpers/application_helper.rb +5 -5

                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments]
                 if attachments
-                  text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+                  text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
-                    align = $1
+                    style = $1
-                    filename = $2
+                    filename = $6
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id
-                      "!#{align}#{image_url}!"
+                      "!#{style}#{image_url}!"
                     else
-                      "!#{align}#{filename}!"
+                      "!#{style}#{filename}!"
                     end
                   end
                 end

lib/redmine/wiki_formatting.rb +2 -1

                 class TextileFormatter < RedCloth
-                  RULES = [:inline_auto_link, :inline_auto_mailto, :textile, :inline_toc, :inline_macros]
+                  # auto_link rule after textile rules so that it doesn't break !image_url! tags
+                  RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
                   def initialize(*args)
                     super

test/unit/helpers/application_helper_test.rb +9 -3

                   textilizable('test@foo.bar')
               end
-              def test_textile_tags
+              def test_inline_images
                 to_test = {
-                  # inline images
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
-                  # textile links
+                  'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
+                  'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height100px;" alt="" />',
+                }
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+              end
+              def test_textile_external_links
+                to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
                   'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
                   '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'

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