From 26507742300406c4e7e05a005f7f7eeefa838548 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Sat, 31 Dec 2011 11:54:35 -0600 Subject: [PATCH] fixed issue 583 (minify error with None) --- VERSION | 2 +- gluon/contrib/minify/minify.py | 4 +++- gluon/globals.py | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index ed1a879f..fc460ab1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2011-12-31 11:47:41) stable +Version 1.99.4 (2011-12-31 11:54:12) stable diff --git a/gluon/contrib/minify/minify.py b/gluon/contrib/minify/minify.py index e7b4ff21..d8d9763f 100644 --- a/gluon/contrib/minify/minify.py +++ b/gluon/contrib/minify/minify.py @@ -43,7 +43,9 @@ def minify(files, path_info, folder, optimize_css, optimize_js, - filename (absolute or relative, css or js, actual or temporary) or - ('css:inline','...css..') - ('js:inline','...js..') - """ + """ + optimize_css = optimize_css or '' + optimize_js = optimize_js or '' concat_css = 'concat' in optimize_css minify_css = 'minify' in optimize_css inline_css = 'inline' in optimize_css diff --git a/gluon/globals.py b/gluon/globals.py index 63b3bc1c..e61223ee 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -233,12 +233,15 @@ class Response(Storage): # cache for 5 minutes by default cache = self.cache_includes or (current.cache.ram, 60*5) def call_minify(): - return minify.minify(files,URL('static','temp'), + return minify.minify(files, + URL('static','temp'), current.request.folder, - self.optimize_css,self.optimize_js) + self.optimize_css, + self.optimize_js) if cache: cache_model, time_expire = cache - files = cache_model('response.files.minified',call_minify, + files = cache_model('response.files.minified', + call_minify, time_expire) else: files = call_minify()