Skip to content

O
OHR Support
Commit 5f871e96 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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

Also added tests for inline images with attributes and moved auto_link and auto_mailto rules after textile rules.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1017 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent bf3b2ec9
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
app/helpers/application_helper.rb
View file @ 5f871e96
...@@ -165,16 +165,16 @@ module ApplicationHelper ...@@ -165,16 +165,16 @@ module ApplicationHelper
# when using an image link, try to use an attachment, if possible # when using an image link, try to use an attachment, if possible
attachments = options[:attachments] attachments = options[:attachments]
if 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) rf = Regexp.new(filename, Regexp::IGNORECASE)
# search for the picture in attachments # search for the picture in attachments
if found = attachments.detect { |att| att.filename =~ rf } if found = attachments.detect { |att| att.filename =~ rf }
image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id
"!#{align}#{image_url}!" "!#{style}#{image_url}!"
else else
"!#{align}#{filename}!" "!#{style}#{filename}!"
end end
end end
end end
......
lib/redmine/wiki_formatting.rb
View file @ 5f871e96
...@@ -25,7 +25,8 @@ module Redmine ...@@ -25,7 +25,8 @@ module Redmine
class TextileFormatter < RedCloth 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) def initialize(*args)
super super
......
test/unit/helpers/application_helper_test.rb
View file @ 5f871e96
...@@ -44,12 +44,18 @@ class ApplicationHelperTest < HelperTestCase ...@@ -44,12 +44,18 @@ class ApplicationHelperTest < HelperTestCase
textilizable('test@foo.bar') textilizable('test@foo.bar')
end end
def test_textile_tags def test_inline_images
to_test = { to_test = {
# inline images
'!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />', '!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>', '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 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>', '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>' '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'
......
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