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

fixed issue 1947, raw args in expose, thanks iiijjjiii

Browse Source
This commit is contained in:
mdipierro
2014-08-08 00:50:42 -05:00
parent 669a22c8be
commit 5c9282aca5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.5-trunk+timestamp.2014.08.08.00.36.55 Version 2.9.5-trunk+timestamp.2014.08.08.00.49.39
gluon/tools.py
+5 -2
View File
@@ -5379,8 +5379,11 @@ class Expose(object):
base = base or os.path.join(current.request.folder, 'static') base = base or os.path.join(current.request.folder, 'static')
basename = basename or current.request.function basename = basename or current.request.function
self.basename = basename self.basename = basename
self.args = current.request.raw_args and \
[arg for arg in current.request.raw_args.split('/') if arg] or [] if current.request.raw_args:
self.args = [arg for arg in current.request.raw_args.split('/') if arg]
else:
self.args = [arg for arg in current.request.args if args]
filename = os.path.join(base, *self.args) filename = os.path.join(base, *self.args)
if not os.path.exists(filename): if not os.path.exists(filename):
raise HTTP(404, "FILE NOT FOUND") raise HTTP(404, "FILE NOT FOUND")