X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5038f36cba2c7db223708d06a65f99b08c25b733..a6e69822f68864512d49a954a4581511246f0e0b:/IkiWiki/Plugin/poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 32756a571..eb0e6ef04 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";
@@ -99,7 +99,7 @@ sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 	if (defined $cgi->param('do') && $cgi->param('do') eq "poll") {
-		my $choice=decode_utf8($cgi->param('choice'));
+		my $choice=decode_utf8(scalar $cgi->param('choice'));
 		if (! defined $choice || not length $choice) {
 			error("no choice specified");
 		}