fixes
parent
e1823922e6
commit
e910e67424
|
@ -9,8 +9,11 @@ sub setup () { # {{{
|
|||
my $setup=possibly_foolish_untaint($config{setup});
|
||||
delete $config{setup};
|
||||
open (IN, $setup) || error("read $setup: $!\n");
|
||||
local $/=undef;
|
||||
my $code=<IN>;
|
||||
my $code;
|
||||
{
|
||||
local $/=undef;
|
||||
$code=<IN>;
|
||||
}
|
||||
($code)=$code=~/(.*)/s;
|
||||
close IN;
|
||||
|
||||
|
|
|
@ -45,5 +45,5 @@ use IkiWiki::Setup::Standard {
|
|||
# Can anonymous web users edit pages?
|
||||
#anonok => 1,
|
||||
# Generate rss feeds for pages?
|
||||
#rss => 1,
|
||||
rss => 1,
|
||||
}
|
||||
|
|
14
ikiwiki
14
ikiwiki
|
@ -466,7 +466,13 @@ sub globlist_match ($$) { #{{{
|
|||
sub main () { #{{{
|
||||
getconfig();
|
||||
|
||||
if ($config{setup}) {
|
||||
if ($config{cgi}) {
|
||||
lockwiki();
|
||||
loadindex();
|
||||
require IkiWiki::CGI;
|
||||
cgi();
|
||||
}
|
||||
elsif ($config{setup}) {
|
||||
require IkiWiki::Setup;
|
||||
setup();
|
||||
}
|
||||
|
@ -475,12 +481,6 @@ sub main () { #{{{
|
|||
require IkiWiki::Wrapper;
|
||||
gen_wrapper();
|
||||
}
|
||||
elsif ($config{cgi}) {
|
||||
lockwiki();
|
||||
loadindex();
|
||||
require IkiWiki::CGI;
|
||||
cgi();
|
||||
}
|
||||
else {
|
||||
lockwiki();
|
||||
loadindex();
|
||||
|
|
Loading…
Reference in New Issue