summaryrefslogtreecommitdiff
path: root/ikiwiki.in
diff options
context:
space:
mode:
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 23:34:07 +0100
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 23:34:07 +0100
commit18b3e970ffcc0f74d68538b7094f76442a294609 (patch)
tree7565862f3e2f86a1e9ff623d991f3150860230a4 /ikiwiki.in
parent23a3de5e8c4998c41afc99664fd4a7fe25e7bf29 (diff)
parent66053f6fc7b300c9b49a5c69d2c7a1eeec841743 (diff)
Merge commit 'origin/master' into aggregateinternal
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-xikiwiki.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/ikiwiki.in b/ikiwiki.in
index e0a591824..3bb881c43 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -123,7 +123,10 @@ sub main () { #{{{
}
elsif ($config{cgi}) {
require IkiWiki::CGI;
- cgi();
+ eval {cgi()};
+ if ($@) {
+ cgierror($@);
+ }
}
elsif ($config{render}) {
require IkiWiki::Render;