From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 18 Dec 2010 17:22:43 +0000 (+0000)
Subject: Merged r4468 from trunk.
X-Git-Tag: 1.0.5~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb30fa49fc81a66c0a9002dc19b4fac4618e4643;p=redmine.git

Merged r4468 from trunk.

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

diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index ffc0e1186..4d8e934f5 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1078,7 +1078,7 @@ class RedCloth3 < String
                         line = "<redpre##{ @pre_list.length }>"
                         first.match(/<#{ OFFTAGS }([^>]*)>/)
                         tag = $1
-                        $2.to_s.match(/(class\=\S+)/i)
+                        $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i)
                         tag << " #{$1}" if $1
                         @pre_list << "<#{ tag }>#{ aftertag }"
                     end
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 16ef60182..dd8486304 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -284,6 +284,9 @@ RAW
       "<!-- opening comment" => "<p>&lt;!-- opening comment</p>",
       # remove attributes except class
       "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
+      '<pre class="foo">some text</pre>' => '<pre class="foo">some text</pre>',
+      "<pre class='foo bar'>some text</pre>" => "<pre class='foo bar'>some text</pre>",
+      '<pre class="foo bar">some text</pre>' => '<pre class="foo bar">some text</pre>',
       "<pre onmouseover='alert(1)'>some text</pre>" => "<pre>some text</pre>",
     }
     to_test.each { |text, result| assert_equal result, textilizable(text) }