web commit by JoshTriplett: Fix link.

[git.ikiwiki.info.git] / IkiWiki / Plugin / poll.pm

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index bca8f5d547e23552b1eb7338495754b9541c0eef..320d2fa775e6660736608b999a202d3c664e5cbb 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -22,7 +22,7 @@ sub preprocess (@) { #{{{
 
        my $open=yesno($params{open});
        my $showtotal=yesno($params{total});
-       my $percent=yesno($params{percent});
+       my $showpercent=yesno($params{percent});
        $pagenum{$params{page}}++;
 
        my %choices;
@@ -46,7 +46,7 @@ sub preprocess (@) { #{{{
        my $ret="";
        foreach my $choice (@choices) {
                my $percent=$total > 0 ? int($choices{$choice} / $total * 100) : 0;
-               if ($percent) {
+               if ($showpercent) {
                        $ret.="$choice ($percent%) ";
                }
                else {
@@ -108,7 +108,7 @@ sub cgi ($) { #{{{
                        if (--$num == 0) {
                                $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se;
                                if (defined $oldchoice) {
-                                       $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1)." \"$oldchoice\"".$3/se;
+                                       $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se;
                                }
                        }
                        return "[[poll $params]]";