diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-27 13:00:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-27 13:00:48 -0400 |
| commit | 7351d545d96df3c1359312b1a5b79530fa6ab4fd (patch) | |
| tree | 07bf7a96a7791a8bdef951aa6e7c0ddfb3489c2a /IkiWiki/Plugin/poll.pm | |
| parent | 7e513f22a6c78fbb25dabf3526ad987b76b91d86 (diff) | |
| parent | 7f8259441058b16db1fd8dc2c6a53827a46794d8 (diff) | |
Merge commit 'smcv/beautify'
Conflicts:
IkiWiki/Plugin/recentchanges.pm
Note that smcv's approach of using urlto also gets the url right when
redirecting to a non-html file, which is a better approach than my recent
fix to recentchanges
Diffstat (limited to 'IkiWiki/Plugin/poll.pm')
| -rw-r--r-- | IkiWiki/Plugin/poll.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 35717c85f..84b02682e 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -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; } } #}}} |