* Add "template" option to inline plugin to allow for use of customised

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index c762712ba3caf1e7a62d44befef0dbb7b39c113b..5dd1064f9fd6900d302dcde2128f35f67cffb09d 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -31,7 +31,6 @@ sub getconfig () { #{{{
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
-                       "anonok!" => \$config{anonok},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
@@ -46,6 +45,7 @@ sub getconfig () { #{{{
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
+                       "userdir=s" => \$config{userdir},
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
@@ -117,6 +117,12 @@ sub main () { #{{{
                require IkiWiki::Render;
                commandline_render();
        }
+       elsif ($config{post_commit} && ! commit_hook_enabled()) {
+               if ($config{notify}) {
+                       loadindex();
+                       rcs_notify();
+               }
+       }
        else {
                lockwiki();
                loadindex();