poll: Fix behavior of poll buttons when inlined.

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 32756a5712301cb6977f498dd61d99ebea054d71..3bd4af2060111ed4dbe12e3262c0f1e200ca6ba7 100644 (file)
--- 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});
        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;
 
        my %choices;
        my @choices;


@@ -66,7 +66,7 @@ sub preprocess (@) {
                }
                if ($open && exists $config{cgiurl}) {
                        $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
                }
                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";
                        $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.="<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";
                $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 97ddc4e65d482e4873627fbe6e570757ea7b0a7a..92c97e947a82017d99c5a840535a8a0d6bae9f1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20130904.2) UNRELEASED; urgency=low
 
   * aggregate: Improve display of post author.
 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
 
 
  -- 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 f78231f7ccb664998bb66a4095694dc2a80b4998..61c14491551cf02657446cf6bae482ab4f1896fd 100644 (file)
--- 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]]
 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]]