diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-19 21:06:06 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-19 21:06:06 +0000 |
| commit | 5f871e965746d6c3e3642d74a321516d13aa66dc (patch) | |
| tree | f7463912cd828690fdfbe8714d533fbd692133f3 /lib/redmine/wiki_formatting.rb | |
| parent | bf3b2ec973a962bf7123e04ba54bc14238aefc9a (diff) | |
| download | redmine-5f871e965746d6c3e3642d74a321516d13aa66dc.tar.gz redmine-5f871e965746d6c3e3642d74a321516d13aa66dc.zip | |
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
Diffstat (limited to 'lib/redmine/wiki_formatting.rb')
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 4aebe9a96..f7fa803a6 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -25,7 +25,8 @@ module Redmine 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 |