Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index b8d14ad3e620aedb31a70f6ad23b7a415f9d97eb..fadc1773e66a61758d0012991e32da66d5ae0209 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -24,7 +24,7 @@ my %pagenum;
 sub preprocess (@) { #{{{
        my %params=(open => "yes", total => "yes", percent => "yes", @_);
 
-       my $open=IkiWIki::yesno($params{open});
+       my $open=IkiWiki::yesno($params{open});
        my $showtotal=IkiWiki::yesno($params{total});
        my $showpercent=IkiWiki::yesno($params{percent});
        $pagenum{$params{page}}++;
@@ -102,7 +102,7 @@ sub sessioncgi ($$) { #{{{
                my $oldchoice=$session->param($choice_param);
                if (defined $oldchoice && $oldchoice eq $choice) {
                        # Same vote; no-op.
-                       IkiWiki::redirect($cgi, "$config{url}/".htmlpage($page));
+                       IkiWiki::redirect($cgi, urlto($page, undef, 1));
                        exit;
                }
 
@@ -149,7 +149,7 @@ sub sessioncgi ($$) { #{{{
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
                print $cgi->redirect(-cookie => $cookie,
-                       -url => "$config{url}/".htmlpage($page));
+                       -url => urlto($page, undef, 1));
                exit;
        }
 } #}}}