diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-21 17:39:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-21 17:39:02 +0000 |
| commit | 35a14cbfdc9fb65e046d22af02dbf95398284b5d (patch) | |
| tree | 2ccb199ca80d0949d1d621ec0323733358ac5543 /lib | |
| parent | bbf422e22933c286e0779e51fd0cc797f339e134 (diff) | |
| download | redmine-35a14cbfdc9fb65e046d22af02dbf95398284b5d.tar.gz redmine-35a14cbfdc9fb65e046d22af02dbf95398284b5d.zip | |
Wiki links:
* fixes wiki links with pipe in table (closes #893, #870, #894)
* prevent wiki link matching on multiple lines
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1280 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcloth.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redcloth.rb b/lib/redcloth.rb index 14940cb88..9452c2670 100644 --- a/lib/redcloth.rb +++ b/lib/redcloth.rb @@ -510,7 +510,8 @@ class RedCloth < String ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m cells = [] - row.split( '|' ).each do |cell| + #row.split( /\(?!\[\[[^\]])|(?![^\[]\]\])/ ).each do |cell| + row.split( /\|(?![^\[\|]*\]\])/ ).each do |cell| ctyp = 'd' ctyp = 'h' if cell =~ /^_/ |