From d61748466eff27eb1ae3f210b82ee1d2528de444 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 2 Sep 2012 22:30:33 -0500 Subject: [PATCH] conditional session connect only --- VERSION | 2 +- applications/welcome/languages/it.py | 3 +++ gluon/main.py | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 40504481..bb11df7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.6 (2012-09-02 15:09:28) stable +Version 2.0.6 (2012-09-02 22:30:28) stable diff --git a/applications/welcome/languages/it.py b/applications/welcome/languages/it.py index 43a60561..90f5d3e1 100644 --- a/applications/welcome/languages/it.py +++ b/applications/welcome/languages/it.py @@ -60,6 +60,7 @@ 'edit profile': 'modifica profilo', 'Edit This App': 'Modifica questa applicazione', 'Email and SMS': 'Email and SMS', +'Email non valida': 'Email non valida', 'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g', 'Errors': 'Errors', 'export as csv file': 'esporta come file CSV', @@ -114,6 +115,7 @@ 'new record inserted': 'nuovo record inserito', 'next 100 rows': 'prossime 100 righe', 'No databases in this application': 'Nessun database presente in questa applicazione', +'Non può essere vuoto': 'Non può essere vuoto', 'not authorized': 'non autorizzato', 'Object or table name': 'Object or table name', 'Online examples': 'Vedere gli esempi', @@ -167,6 +169,7 @@ 'This App': 'This App', 'This is a copy of the scaffolding application': "Questa è una copia dell'applicazione di base (scaffold)", 'Timestamp': 'Ora (timestamp)', +'too short': 'too short', 'Twitter': 'Twitter', 'unable to parse csv file': 'non riesco a decodificare questo file CSV', 'Update': 'Update', diff --git a/gluon/main.py b/gluon/main.py index 4854811f..9d382a34 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -522,8 +522,7 @@ def wsgibase(environ, responder): # ################################################## # on success, try store session in database # ################################################## - if not env.web2py_disable_session: - session._try_store_in_db(request, response) + session._try_store_in_db(request, response) # ################################################## # on success, commit database @@ -543,8 +542,7 @@ def wsgibase(environ, responder): # this must be done after trying to commit database! # ################################################## - if not env.web2py_disable_session: - session._try_store_on_disk(request, response) + session._try_store_on_disk(request, response) # ################################################## # store cookies in headers