* Display CGI processing errors if present.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 671f0b9248c463db5cbc9e4c5713217735760f8e..53e151dc2696eb193dbabf9c61bb9986dcaa6f6a 100644 (file)
--- 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 359ea1c132cb9ce82506e20d321ff1c6e2d4a670..b2f037e2fb1450d7f7714ccc6675f81f73727ead 100644 (file)
--- 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