From 07afe71f37e7f5bee3f46c1899c1563c8abfb475 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 3 Dec 2012 18:02:45 -0600
Subject: [PATCH] fixed filename in dal storage, thanks Marin

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

diff --git a/VERSION b/VERSION
index 75c304c4..6b8153e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-12-03 17:38:35) stable
+Version 2.2.1 (2012-12-03 18:01:57) stable
diff --git a/gluon/dal.py b/gluon/dal.py
index 88e5bd88..d9a1b73d 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -8558,8 +8558,8 @@ class Field(Expression):
         if self.custom_store:
             return self.custom_store(file,filename,path)
         if isinstance(file, cgi.FieldStorage):
-            file = file.file
             filename = filename or file.filename
+            file = file.file
         elif not filename:
             filename = file.name
         filename = os.path.basename(filename.replace('/', os.sep)\