@@ -465,8 +465,7 @@ class RedCloth < String
style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
end
- style << "#{ htmlesc $1 };" if not filter_styles and
- text.sub!( /\{([^}]*)\}/, '' )
+ style << "#{ htmlesc $1 };" if text.sub!( /\{([^}]*)\}/, '' ) && !filter_styles
lang = $1 if
text.sub!( /\[([^)]+?)\]/, '' )
lib/redcloth.rb
@@ -32,6 +32,7 @@ module Redmine
super
self.hard_breaks=true
self.no_span_caps=true
+ self.filter_styles=true
end
def to_html(*rules, &block)
lib/redmine/wiki_formatting.rb
@@ -49,7 +49,8 @@ class ApplicationHelperTest < HelperTestCase
'!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>',
'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="" />',
+ # inline styles should be stripped
+ 'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" alt="" />',
'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',
'with title !http://foo.bar/image.jpg(This is a double-quoted "title")!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a double-quoted "title"" alt="This is a double-quoted "title"" />',
}
test/unit/helpers/application_helper_test.rb
6ae66f4dbff91d4392d59254ed77eb833edced0c
Jean-Philippe Lang
jp_lang@yahoo.fr
http://github.com/edavis10/redmine/commit/7da7e853a34773ef6786b184a9e52bc86cab1507
7da7e853a34773ef6786b184a9e52bc86cab1507
2008-12-28T05:45:53-08:00
2008-12-28T05:45:53-08:00
Backported r2192 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.7-stable@2194 e93f8b46-1217-0410-a6f0-8f06a7374b81
02ea16ed89d891c5b48b7e7d014464069ffc603e
Jean-Philippe Lang
jp_lang@yahoo.fr