dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1398, brackets in libspatialite load extension, thanks rmdpedroso

Browse Source
This commit is contained in:
Massimo committed 2013-03-21 11:21:53 -05:00
1 parent 3494fa2d0d
commit 675245eb15
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.5-stable+timestamp.2013.03.18.22.48.15 Version 2.4.5-stable+timestamp.2013.03.21.11.20.48
applications/admin/controllers/default.py
+1 -1
View File
@@ -146,7 +146,7 @@ def check_version():
elif new_version != True: elif new_version != True:
return A(T('web2py is up to date'), _href=WEB2PY_URL) return A(T('web2py is up to date'), _href=WEB2PY_URL)
elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"): elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3]) return SPAN('You should upgrade to version %s' % version_number)
else: else:
return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0]) return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0])
gluon/dal.py
+1 -1
View File
@@ -2260,7 +2260,7 @@ class SpatiaLiteAdapter(SQLiteAdapter):
# Linux uses libspatialite.so # Linux uses libspatialite.so
# Mac OS X uses libspatialite.dylib # Mac OS X uses libspatialite.dylib
libspatialite = SPATIALLIBS[platform.system()] libspatialite = SPATIALLIBS[platform.system()]
self.execute(r'SELECT load_extension("%s");') % libspatialite self.execute(r'SELECT load_extension("%s");' % libspatialite)
self.connection.create_function('web2py_extract', 2, self.connection.create_function('web2py_extract', 2,
SQLiteAdapter.web2py_extract) SQLiteAdapter.web2py_extract)