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

fixed bug in cache minify, thanks Jeremy

Browse Source
This commit is contained in:
mdipierro
2012-09-11 08:24:59 -05:00
parent 25ca7fe6fe
commit 7bb465df07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.8 (2012-09-10 18:26:41) stable Version 2.0.8 (2012-09-11 08:24:53) stable
gluon/globals.py
+3 -3
View File
@@ -230,7 +230,6 @@ class Response(Storage):
def include_files(self): def include_files(self):
""" """
Caching method for writing out files. Caching method for writing out files.
By default, caches in ram for 5 minutes. To change, By default, caches in ram for 5 minutes. To change,
@@ -244,8 +243,9 @@ class Response(Storage):
if not item in files: files.append(item) if not item in files: files.append(item)
if have_minify and (self.optimize_css or self.optimize_js): if have_minify and (self.optimize_css or self.optimize_js):
# cache for 5 minutes by default # cache for 5 minutes by default
key = hashlib.md5(repr(files)).hexdigest()
cache = self.cache_includes or (current.cache.ram, 60*5) cache = self.cache_includes or (current.cache.ram, 60*5)
def call_minify(): def call_minify(files=files):
return minify.minify(files, return minify.minify(files,
URL('static','temp'), URL('static','temp'),
current.request.folder, current.request.folder,
@@ -253,7 +253,7 @@ class Response(Storage):
self.optimize_js) self.optimize_js)
if cache: if cache:
cache_model, time_expire = cache cache_model, time_expire = cache
files = cache_model('response.files.minified', files = cache_model('response.files.minified/'+key,
call_minify, call_minify,
time_expire) time_expire)
else: else: