aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-11-06 20:49:18 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-11-06 20:49:18 -0500
commit11d377af816b30eba336fae2993a79362443c293 (patch)
tree7bed8d9eb92949be0f4f0b8df6dcb725234c76a5
parent96d52b82edffae197ae182f7073d4b7a8d88880b (diff)
downloadikiwiki-11d377af816b30eba336fae2993a79362443c293.tar
ikiwiki-11d377af816b30eba336fae2993a79362443c293.tar.gz
txt: Do not encode quotes when filtering the txt, as that broke later parsing of any directives on the page.
-rw-r--r--IkiWiki/Plugin/txt.pm2
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn2
-rw-r--r--docwiki.setup2
-rw-r--r--po/ikiwiki.pot4
5 files changed, 8 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index e4c9e5d6a..e157bf07e 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -39,7 +39,7 @@ sub filter (@) {
my $content = $params{content};
if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
- encode_entities($content);
+ encode_entities($content, "<>&");
if ($findurl) {
my $finder = URI::Find->new(sub {
my ($uri, $orig_uri) = @_;
diff --git a/debian/changelog b/debian/changelog
index a197369cc..424c99ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
if no xml:base info is available.
* 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
diff --git a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
index d2d5a46ed..22224483e 100644
--- a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
+++ b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
@@ -15,3 +15,5 @@ Here is the header:
[[GNU_Free_Documentation_License|/fdl]]."]]"""]]
--[[tschwinge]]
+
+> [[done]], made it less zealous about encoding html entities. --[[Joey]]
diff --git a/docwiki.setup b/docwiki.setup
index 6d732fd6b..bb9616d04 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -15,5 +15,5 @@ use IkiWiki::Setup::Standard {
userdir => "users",
usedirs => 0,
prefix_directives => 1,
- add_plugins => [qw{goodstuff version haiku polygen fortune}],
+ add_plugins => [qw{goodstuff version haiku polygen fortune txt}],
}
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 5db0c51af..6894dd2f6 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,7 +120,7 @@ msgstr ""
msgid "feed crashed XML::Feed!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:590
+#: ../IkiWiki/Plugin/aggregate.pm:591
#, perl-format
msgid "creating new page %s"
msgstr ""