Backported r2192 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.7-stable@2194 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redcloth.rb

@@ -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/redmine/wiki_formatting.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)