From 796c8ff9794f3f36942e47a0cb5626423974dd7c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 2 Aug 2012 21:28:38 -0500
Subject: [PATCH] possible fix to address upload problem, thanks Marin

---
 VERSION          | 2 +-
 gluon/sqlhtml.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 9fc629c8..52c8e848 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-02 10:17:12) dev
+Version 2.00.0 (2012-08-02 21:28:32) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 29431805..9310731c 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1229,7 +1229,7 @@ class SQLFORM(FORM):
                 continue  # do not update if password was not changed
             elif field.type == 'upload':
                 f = self.vars[fieldname]
-                f = f or self.table[fieldname].default or f
+                f = f if not f in (None,'') else self.table[fieldname].default
                 fd = '%s__delete' % fieldname
                 if f == '' or f is None:
                     if self.vars.get(fd, False) or not self.record: