From 8d11647a8d654da65e0a457aeda1d818da5f2643 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 29 Mar 2014 17:07:25 -0500 Subject: [PATCH] better fix for patch 414, starting web2py from other folder --- VERSION | 2 +- applications/admin/models/0.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 161c4e56..67d929c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.5-trunk+timestamp.2014.03.29.00.57.10 +Version 2.9.5-trunk+timestamp.2014.03.29.17.06.19 diff --git a/applications/admin/models/0.py b/applications/admin/models/0.py index 8ba7420e..9f0a1d5a 100644 --- a/applications/admin/models/0.py +++ b/applications/admin/models/0.py @@ -45,4 +45,7 @@ if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage'] T.force(request.cookies['adminLanguage'].value) #set static_version -response.static_version = open('VERSION').read().split(' ',1)[1].split('-')[0] +from gluon.settings import global_settings +response.static_version = global_settings.web2py_version.split('-')[0] + +