summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-01-24 16:56:28 -0400
committerJoey Hess <joey@kitenet.net>2011-01-24 16:56:28 -0400
commit2be49b623a85b10ad584d7e4e8c31c8436d1c16f (patch)
tree27b93d6d356515ea6a2e03cd74e9503c7b335892
parentbb8303dc87a859066eb910388c296c44a970d346 (diff)
bleagh
-rw-r--r--IkiWiki/Plugin/comments.pm2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d9183970d..6691dbafa 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -365,7 +365,7 @@ sub editcomment ($$) {
# The untaint is OK (as in editpage) because we're about to pass
# it to file_pruned and wiki_file_regexp anyway.
- my $page = $form->field('page')=~/$config{wiki_file_regexp}/;
+ my ($page) = $form->field('page')=~/$config{wiki_file_regexp}/;
$page = IkiWiki::possibly_foolish_untaint($page);
if (! defined $page || ! length $page ||
IkiWiki::file_pruned($page)) {
diff --git a/debian/changelog b/debian/changelog
index b6465a2f1..94eb507e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20110124) UNRELEASED; urgency=low
+
+ * comments: Fix commenting, broken by security fix.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 24 Jan 2011 16:56:05 -0400
+
ikiwiki (3.20110123) unstable; urgency=low
* Adapt autoindex test suite to work with old Test::More.