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/Plugin/websetup.pm | |
| parent | b3f7c6a9a579208f555a9ae7a409474d68897d04 (diff) | |
| parent | 18bb93f5744c1b57b929d9f8a6042e51fc5256f0 (diff) | |
Merge remote branch 'smcv/ready/localurl'
Diffstat (limited to 'IkiWiki/Plugin/websetup.pm')
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 9c032fdc6..6a5190301 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -288,7 +288,7 @@ sub showform ($$) { fieldsets => [ [main => gettext("main")], ], - action => $config{cgiurl}, + action => IkiWiki::cgiurl(), template => {type => 'div'}, stylesheet => 1, ); @@ -344,7 +344,7 @@ sub showform ($$) { IkiWiki::decode_form_utf8($form); if ($form->submitted eq "Cancel") { - IkiWiki::redirect($cgi, $config{url}); + IkiWiki::redirect($cgi, IkiWiki::baseurl(undef)); return; } elsif (($form->submitted eq 'Save Setup' || $form->submitted eq 'Rebuild Wiki') && $form->validate) { |