fixed issue 1398, brackets in libspatialite load extension, thanks rmdpedroso
This commit is contained in:
2
VERSION
2
VERSION
@@ -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
|
||||
|
||||
@@ -146,7 +146,7 @@ def check_version():
|
||||
elif new_version != True:
|
||||
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"):
|
||||
return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3])
|
||||
return SPAN('You should upgrade to version %s' % version_number)
|
||||
else:
|
||||
return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0])
|
||||
|
||||
|
||||
@@ -2260,7 +2260,7 @@ class SpatiaLiteAdapter(SQLiteAdapter):
|
||||
# Linux uses libspatialite.so
|
||||
# Mac OS X uses libspatialite.dylib
|
||||
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,
|
||||
SQLiteAdapter.web2py_extract)
|
||||
|
||||
Reference in New Issue
Block a user