diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-10 21:13:41 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-10 21:13:41 +0000 |
| commit | 50c21744cac9842b75bfafd776b3dc4c38370b03 (patch) | |
| tree | e49e1c35ebcb7a4c8acbea9a526b74a9823b6d0c | |
| parent | dfcd4c299a2a36cacb1de29c67559ac3869e90c8 (diff) | |
| download | ikiwiki-50c21744cac9842b75bfafd776b3dc4c38370b03.tar ikiwiki-50c21744cac9842b75bfafd776b3dc4c38370b03.tar.gz | |
* Display CGI processing errors if present.
| -rw-r--r-- | IkiWiki/CGI.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 671f0b924..53e151dc2 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -534,7 +534,13 @@ sub cgi () { #{{{ my $do=$q->param('do'); if (! defined $do || ! length $do) { - error("\"do\" parameter missing"); + my $error = $q->cgi_error; + if ($error) { + error("Request not processed: $error"); + } + else { + error("\"do\" parameter missing"); + } } # Things that do not need a session. diff --git a/debian/changelog b/debian/changelog index 359ea1c13..b2f037e2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ ikiwiki (1.9) UNRELEASED; urgency=low original wiki syntax, CamelCase links and all. * Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server. + * Display CGI processing errors if present. - -- Joey Hess <joeyh@debian.org> Fri, 7 Jul 2006 14:11:50 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 10 Jul 2006 17:12:57 -0400 ikiwiki (1.8) unstable; urgency=low |