(no commit message)

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 1ce7e16887d3389620349ff357ca165a87deabca..3bb881c4320f246b1edd4f9af80014149036d9e4 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},


@@ -122,7 +123,10 @@ sub main () { #{{{
        }
        elsif ($config{cgi}) {
                require IkiWiki::CGI;
        }
        elsif ($config{cgi}) {
                require IkiWiki::CGI;

-               cgi();
+               eval {cgi()};
+               if ($@) {
+                       cgierror($@);
+               }

        }
        elsif ($config{render}) {
                require IkiWiki::Render;
        }
        elsif ($config{render}) {
                require IkiWiki::Render;