aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-11-13 22:06:02 -0400
committerJoey Hess <joey@kitenet.net>2013-11-13 22:06:02 -0400
commit2f8bafb70947e8b2d6b8b2882e32dde60faa9a27 (patch)
tree59aa8d9a535defd45e69201a0baef61d46053237
parent5ec2d2d40d803ac0288acdcdd5125de6f4c2b769 (diff)
downloadikiwiki-2f8bafb70947e8b2d6b8b2882e32dde60faa9a27.tar
ikiwiki-2f8bafb70947e8b2d6b8b2882e32dde60faa9a27.tar.gz
poll: Fix behavior of poll buttons when inlined.
-rw-r--r--IkiWiki/Plugin/poll.pm6
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/poll_in_inline.mdwn2
3 files changed, 6 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 32756a571..3bd4af206 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -30,7 +30,7 @@ sub preprocess (@) {
my $showtotal=IkiWiki::yesno($params{total});
my $showpercent=IkiWiki::yesno($params{percent});
my $expandable=IkiWiki::yesno($params{expandable});
- $pagenum{$params{page}}++;
+ my $num=++$pagenum{$params{page}}{$params{destpage}};
my %choices;
my @choices;
@@ -66,7 +66,7 @@ sub preprocess (@) {
}
if ($open && exists $config{cgiurl}) {
$ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
- $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n";
+ $ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
$ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
$ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
@@ -81,7 +81,7 @@ sub preprocess (@) {
$ret.="<p>\n";
$ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n";
$ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
- $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n";
+ $ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
$ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n";
$ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
diff --git a/debian/changelog b/debian/changelog
index 97ddc4e65..92c97e947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ikiwiki (3.20130904.2) UNRELEASED; urgency=low
* aggregate: Improve display of post author.
+ * poll: Fix behavior of poll buttons when inlined.
-- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400
diff --git a/doc/bugs/poll_in_inline.mdwn b/doc/bugs/poll_in_inline.mdwn
index f78231f7c..61c144915 100644
--- a/doc/bugs/poll_in_inline.mdwn
+++ b/doc/bugs/poll_in_inline.mdwn
@@ -2,3 +2,5 @@ When the poll directive appears in an inline, clicking on the button is
supposed to vote and go to the page for that poll. Instead, I see it always
apparantly skip counting my vote, and redirect to the page for that poll.
--[[Joey]]
+
+> [[fixed|done]] --[[Joey]]