Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
websetup.pm
diff --git
a/IkiWiki/Plugin/websetup.pm
b/IkiWiki/Plugin/websetup.pm
index 0ab18997c860d90a2841064a0ffc536f195fd21a..0a3d90aec0d9654269fd70c63f6e9825f219c6a8 100644
(file)
--- a/
IkiWiki/Plugin/websetup.pm
+++ b/
IkiWiki/Plugin/websetup.pm
@@
-288,7
+288,7
@@
sub showform ($$) {
fieldsets => [
[main => gettext("main")],
],
fieldsets => [
[main => gettext("main")],
],
- action =>
$config{cgiurl}
,
+ action =>
IkiWiki::cgiurl()
,
template => {type => 'div'},
stylesheet => 1,
);
template => {type => 'div'},
stylesheet => 1,
);
@@
-344,7
+344,7
@@
sub showform ($$) {
IkiWiki::decode_form_utf8($form);
if ($form->submitted eq "Cancel") {
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) {
return;
}
elsif (($form->submitted eq 'Save Setup' || $form->submitted eq 'Rebuild Wiki') && $form->validate) {
@@
-447,10
+447,10
@@
sub showform ($$) {
IkiWiki::saveindex();
IkiWiki::unlockwiki();
IkiWiki::saveindex();
IkiWiki::unlockwiki();
- # Print the top part of a standard
misc
template,
+ # Print the top part of a standard
cgi
template,
# then show the rebuild or refresh, live.
my $divider="\0";
# then show the rebuild or refresh, live.
my $divider="\0";
- my $html=IkiWiki::
misctemplate(
"setup", $divider);
+ my $html=IkiWiki::
cgitemplate($cgi,
"setup", $divider);
IkiWiki::printheader($session);
my ($head, $tail)=split($divider, $html, 2);
print $head."<pre>\n";
IkiWiki::printheader($session);
my ($head, $tail)=split($divider, $html, 2);
print $head."<pre>\n";
@@
-475,7
+475,7
@@
sub showform ($$) {
join(" ", @command), $ret).
'</p>';
open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
join(" ", @command), $ret).
'</p>';
open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
- print OUT
$oldsetup
;
+ print OUT
Encode::encode_utf8($oldsetup)
;
close OUT;
}
close OUT;
}