web commit by http://sabr.myopenid.com/: thanks belong at the end of the conversation...

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 2aeaf94ecedc4ffd210d9c774dab983a58050f2d..e0a59182422ae0d2aaa1b69d15fa3463f144d9c8 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -29,6 +29,7 @@ sub getconfig () { #{{{
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},

+                       "prefix-directives!" => \$config{prefix_directives},

                        "getctime" => \$config{getctime},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "getctime" => \$config{getctime},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},


@@ -36,12 +37,10 @@ sub getconfig () { #{{{
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},

-                       "notify!" => \$config{notify},

                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},

-                       "svnrepo" => \$config{svnrepo},

                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},


@@ -123,7 +122,6 @@ sub main () { #{{{
                gen_wrapper();
        }
        elsif ($config{cgi}) {
                gen_wrapper();
        }
        elsif ($config{cgi}) {

-               loadindex();

                require IkiWiki::CGI;
                cgi();
        }
                require IkiWiki::CGI;
                cgi();
        }


@@ -132,10 +130,7 @@ sub main () { #{{{
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {

-               if ($config{notify}) {
-                       loadindex();
-                       rcs_notify();
-               }
+               # do nothing

        }
        else {
                lockwiki();
        }
        else {
                lockwiki();


@@ -143,7 +138,6 @@ sub main () { #{{{
                require IkiWiki::Render;
                rcs_update();
                refresh();
                require IkiWiki::Render;
                rcs_update();
                refresh();

-               rcs_notify() if $config{notify};

                saveindex();
        }
 } #}}}
                saveindex();
        }
 } #}}}