diff options
author | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
commit | 0ae1e4cc0e598eacfeb508d11db81c33169631fd (patch) | |
tree | f779fd1bd4b4eaae315473ea70f9c1e85a7981d1 /IkiWiki/CGI.pm | |
parent | b3f7c6a9a579208f555a9ae7a409474d68897d04 (diff) | |
parent | 18bb93f5744c1b57b929d9f8a6042e51fc5256f0 (diff) |
Merge remote branch 'smcv/ready/localurl'
Diffstat (limited to 'IkiWiki/CGI.pm')
-rw-r--r-- | IkiWiki/CGI.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index f2a32a958..e0bfda9ae 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -116,7 +116,7 @@ sub cgi_signin ($$;$) { required => 'NONE', javascript => 0, params => $q, - action => $config{cgiurl}, + action => cgiurl(), header => 0, template => {type => 'div'}, stylesheet => 1, @@ -198,7 +198,7 @@ sub cgi_prefs ($$) { required => 'NONE', javascript => 0, params => $q, - action => $config{cgiurl}, + action => cgiurl(), template => {type => 'div'}, stylesheet => 1, fieldsets => [ @@ -231,11 +231,11 @@ sub cgi_prefs ($$) { if ($form->submitted eq 'Logout') { $session->delete(); - redirect($q, $config{url}); + redirect($q, baseurl(undef)); return; } elsif ($form->submitted eq 'Cancel') { - redirect($q, $config{url}); + redirect($q, baseurl(undef)); return; } elsif ($form->submitted eq 'Save Preferences' && $form->validate) { |