diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-28 23:06:24 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-08-28 23:06:24 +0000 |
| commit | 4142c02f738ac119086509aa979ead5146b32a52 (patch) | |
| tree | 310f6f667065b26b93fa84bcde0cd0ed7016f2f6 /IkiWiki/Plugin/table.pm | |
| parent | 25294defb814e6d4a53848c89a86e982bda1fc30 (diff) | |
| download | ikiwiki-4142c02f738ac119086509aa979ead5146b32a52.tar ikiwiki-4142c02f738ac119086509aa979ead5146b32a52.tar.gz | |
* Tables containing links with a link text were misparsed, because the "|"
in the wikilink looked like a table field separator. Avoid this ambiguity
by linkifying the data before parsing it as a table.
* Turn on allow_loose_quotes in the table plugin's Text::CSV object,
so that links from wikilinks don't confuse the parser.
Diffstat (limited to 'IkiWiki/Plugin/table.pm')
| -rw-r--r-- | IkiWiki/Plugin/table.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 698f9c9b6..c7b664052 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -22,6 +22,10 @@ sub preprocess (@) { #{{{ } $params{data} = readfile(srcfile($params{file})); } + else { + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); + } if (lc $params{format} eq 'auto') { # first try the more simple format @@ -92,6 +96,7 @@ sub split_csv ($$) { #{{{ my $csv = Text::CSV->new({ sep_char => defined $delimiter ? $delimiter : ",", binary => 1, + allow_loose_quotes => 1, }) || error("could not create a Text::CSV object"); my $l=0; |