urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

txt: Do not encode quotes when filtering the txt, as that broke later parsing of any directives on the page.

master
Joey Hess 2008-11-06 20:49:18 -05:00
parent 96d52b82ed
commit 11d377af81
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/txt.pm
View File

@ -39,7 +39,7 @@ sub filter (@) {
my $content = $params{content}; my $content = $params{content};
if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) { if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
encode_entities($content); encode_entities($content, "<>&");
if ($findurl) { if ($findurl) {
my $finder = URI::Find->new(sub { my $finder = URI::Find->new(sub {
my ($uri, $orig_uri) = @_; my ($uri, $orig_uri) = @_;

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low
as a not yet released XML::RSS, it will fall back to the old method as a not yet released XML::RSS, it will fall back to the old method
if no xml:base info is available. if no xml:base info is available.
* meta: Plugin is now enabled by default since the basewiki uses it. * meta: Plugin is now enabled by default since the basewiki uses it.
* txt: Do not encode quotes when filtering the txt, as that broke
later parsing of any directives on the page.
-- Joey Hess <joeyh@debian.org> Thu, 06 Nov 2008 16:01:00 -0500 -- Joey Hess <joeyh@debian.org> Thu, 06 Nov 2008 16:01:00 -0500

2
doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
View File

@ -15,3 +15,5 @@ Here is the header:
[[GNU_Free_Documentation_License|/fdl]]."]]"""]] [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
--[[tschwinge]] --[[tschwinge]]
> [[done]], made it less zealous about encoding html entities. --[[Joey]]

2
docwiki.setup
View File

@ -15,5 +15,5 @@ use IkiWiki::Setup::Standard {
userdir => "users", userdir => "users",
usedirs => 0, usedirs => 0,
prefix_directives => 1, prefix_directives => 1,
add_plugins => [qw{goodstuff version haiku polygen fortune}], add_plugins => [qw{goodstuff version haiku polygen fortune txt}],
} }

4
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-03 16:31-0500\n" "POT-Creation-Date: 2008-11-06 20:47-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -120,7 +120,7 @@ msgstr ""
msgid "feed crashed XML::Feed!" msgid "feed crashed XML::Feed!"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:590 #: ../IkiWiki/Plugin/aggregate.pm:591
#, perl-format #, perl-format
msgid "creating new page %s" msgid "creating new page %s"
msgstr "" msgstr ""