X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1eee32c5b553f0fb170650a68f67d9a01f6d2af8..cd23427e2a8d4e24ae68e3567d47cc98c8509f2b:/IkiWiki.pm diff --git a/IkiWiki.pm b/IkiWiki.pm index 10a316e03..aea5b7abf 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -69,15 +69,16 @@ sub defaultconfig () { #{{{ setup => undef, adminuser => undef, adminemail => undef, - plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit + plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit lockedit conditional}], timeformat => '%c', locale => undef, sslcookie => 0, httpauth => 0, userdir => "", - usedirs => 0, + usedirs => 1, numbacklinks => 10, + account_creation_password => "", } #}}} sub checkconfig () { #{{{ @@ -1011,29 +1012,29 @@ sub pagespec_match ($$;@) { #{{{ package IkiWiki::FailReason; -use overload ( +use overload ( #{{{ '""' => sub { ${$_[0]} }, '0+' => sub { 0 }, '!' => sub { bless $_[0], 'IkiWiki::SuccessReason'}, fallback => 1, -); +); #}}} -sub new { +sub new { #{{{ bless \$_[1], $_[0]; -} +} #}}} package IkiWiki::SuccessReason; -use overload ( +use overload ( #{{{ '""' => sub { ${$_[0]} }, '0+' => sub { 1 }, '!' => sub { bless $_[0], 'IkiWiki::FailReason'}, fallback => 1, -); +); #}}} -sub new { +sub new { #{{{ bless \$_[1], $_[0]; -} +}; #}}} package IkiWiki::PageSpec;