add getconfig for inline

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index e0a59182422ae0d2aaa1b69d15fa3463f144d9c8..f48f2cfebcc32c8d6647d1d208ae7b3ad3f24dc0 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -73,9 +73,6 @@ sub getconfig () { #{{{
                        "disable-plugin=s@" => sub {
                                push @{$config{disable_plugins}}, $_[1];
                        },
-                       "pingurl=s" => sub {
-                               push @{$config{pingurl}}, $_[1];
-                       },
                        "set=s" => sub {
                                my ($var, $val)=split('=', $_[1], 2);
                                if (! defined $var || ! defined $val) {
@@ -123,7 +120,10 @@ sub main () { #{{{
        }
        elsif ($config{cgi}) {
                require IkiWiki::CGI;
-               cgi();
+               eval {cgi()};
+               if ($@) {
+                       cgierror($@);
+               }
        }
        elsif ($config{render}) {
                require IkiWiki::Render;