From e44254346c5534269427a80fcec5b4d4ca76c1b1 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 6 May 2013 19:49:57 -0500 Subject: [PATCH] reverting previous patch, Anthony is right, the patch is not backward compatible --- VERSION | 2 +- gluon/sqlhtml.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3c82eef0..c16745af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.06.19.09.29 +Version 2.4.6-stable+timestamp.2013.05.06.19.49.05 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 507eb0d3..988e60e1 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1456,8 +1456,9 @@ class SQLFORM(FORM): if not f: continue else: - ufolder = field.uploadfolder or current.request.folder - f = os.path.join(ufolder, os.path.normpath(f)) + f = os.path.join( + current.request.folder, + os.path.normpath(f)) source_file = open(f, 'rb') original_filename = os.path.split(f)[1] elif hasattr(f, 'file'):