diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-11-11 16:26:05 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-11-11 16:26:05 +0000 |
| commit | 737bbb3d3d67d3c30620c0513c95705705a6eb7a (patch) | |
| tree | 7d1f6a68f0f79114ef13d607b02a18dbe4a4efdc | |
| parent | 7a05f8ed66918e13315e647ecea620a716c4cbeb (diff) | |
| download | redmine-737bbb3d3d67d3c30620c0513c95705705a6eb7a.tar.gz redmine-737bbb3d3d67d3c30620c0513c95705705a6eb7a.zip | |
Less agressive Redcloth lang attribute parsing (#2091).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2020 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redcloth3.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index 220617f14..7898d721f 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -341,7 +341,7 @@ class RedCloth3 < String A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/ A_VLGN = /[\-^~]/ C_CLAS = '(?:\([^)]+\))' - C_LNGE = '(?:\[[^\]]+\])' + C_LNGE = '(?:\[[^\[\]]+\])' C_STYL = '(?:\{[^}]+\})' S_CSPN = '(?:\\\\\d+)' S_RSPN = '(?:/\d+)' diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 087d96316..d23300309 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -177,6 +177,7 @@ class ApplicationHelperTest < HelperTestCase '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>', # striked through link '-[[Another page|Page]]-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a></del>', + '-[[Another page|Page]] link-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a> link</del>', # escaping '![[Another page|Page]]' => '[[Another page|Page]]', } |