diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-01-06 15:05:09 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-01-06 15:05:09 -0500 |
| commit | da166e74227d084fd15878ce9a3099e07ebcc2c2 (patch) | |
| tree | a33e81bb7a33c4c347b42cbf80129d868e8fe71e /IkiWiki/Plugin/table.pm | |
| parent | 26d3ba61467cdd5d05722015a38dc0fbd5053926 (diff) | |
| download | ikiwiki-da166e74227d084fd15878ce9a3099e07ebcc2c2.tar ikiwiki-da166e74227d084fd15878ce9a3099e07ebcc2c2.tar.gz | |
table: Fix misparsed links in external files
linkify data from external files at the same time as data from an inlined
table would be linkified.
Diffstat (limited to 'IkiWiki/Plugin/table.pm')
| -rw-r--r-- | IkiWiki/Plugin/table.pm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 479f3d745..dd124929d 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -50,22 +50,18 @@ sub preprocess (@) { defined $params{delimiter} ? $params{delimiter} : ",",); # linkify after parsing since html link quoting can # confuse CSV parsing - if (! exists $params{file}) { - @data=map { - [ map { - IkiWiki::linkify($params{page}, - $params{destpage}, $_); - } @$_ ] - } @data; - } + @data=map { + [ map { + IkiWiki::linkify($params{page}, + $params{destpage}, $_); + } @$_ ] + } @data; } elsif (lc $params{format} eq 'dsv') { # linkify before parsing since wikilinks can contain the # delimiter - if (! exists $params{file}) { - $params{data} = IkiWiki::linkify($params{page}, - $params{destpage}, $params{data}); - } + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); @data=split_dsv($params{data}, defined $params{delimiter} ? $params{delimiter} : "|",); } |