X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcontact.ml;h=ba88f1df351d0212dfd4478870105472b1f880b7;hb=0502c7025d9f942228d6c838c2bfd73d7f253070;hp=753f695417845ddb0ba1921fc29915cfda59cb4a;hpb=3e686452bc8b27781edb06b68749f7c34bf5fab4;p=cocanwiki.git

diff --git a/scripts/contact.ml b/scripts/contact.ml
index 753f695..ba88f1d 100644
--- a/scripts/contact.ml
+++ b/scripts/contact.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: contact.ml,v 1.1 2004/09/17 12:35:38 rich Exp $
+ * $Id: contact.ml,v 1.3 2004/09/23 11:56:47 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let fail msg =
     error ~back_button:true ~title:"Bad form"
       q (msg ^ "  Please contact the owner of the site by email.");
-    raise CgiExit
+    return ()
   in
 
   (* Get the id field. *)
@@ -95,6 +95,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let names = uniq (List.sort compare names) in
   let uploads = uniq (List.sort compare uploads) in
 
+  (* Some browsers send an empty file for empty uploads.  Remove those. *)
+  let uploads =
+    let not_empty name = (q#upload name).upload_value <> "" in
+    List.filter not_empty uploads in
+
   (* Get the IP address for logging purposes. *)
   let ip =
     try Connection.remote_ip (Request.connection r) with Not_found -> "" in