better extension parsing, thanks Corne
This commit is contained in:
@@ -1 +1 @@
|
||||
Version 2.00.0 (2012-06-28 09:54:19) dev
|
||||
Version 2.00.0 (2012-06-28 09:56:50) dev
|
||||
|
||||
+2
-2
@@ -128,7 +128,7 @@ def LOAD(c=None, f='index', args=None, vars=None,
|
||||
attr['_id']=target
|
||||
request = current.request
|
||||
if '.' in f:
|
||||
f, extension = f.split('.',1)
|
||||
f, extension = f.rsplit('.',1)
|
||||
if url or ajax:
|
||||
url = url or URL(request.application, c, f, r=request,
|
||||
args=args, vars=vars, extension=extension,
|
||||
@@ -235,7 +235,7 @@ class LoadFactory(object):
|
||||
attr['_id']=target
|
||||
request = self.environment['request']
|
||||
if '.' in f:
|
||||
f, extension = f.split('.',1)
|
||||
f, extension = f.rsplit('.',1)
|
||||
if url or ajax:
|
||||
url = url or html.URL(request.application, c, f, r=request,
|
||||
args=args, vars=vars, extension=extension,
|
||||
|
||||
+1
-1
@@ -275,7 +275,7 @@ def URL(
|
||||
extension = None
|
||||
|
||||
if '.' in function:
|
||||
function, extension = function.split('.', 1)
|
||||
function, extension = function.rsplit('.', 1)
|
||||
|
||||
function2 = '%s.%s' % (function,extension or 'html')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user