Moved short-circuit code to Compressor.output method.

spookylukey · Apr 8, 2011 · 4a364dc · 4a364dc
1 parent 0aaac83
commit 4a364dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compressor/base.py b/compressor/base.py
@@ -156,6 +156,9 @@ def output(self, mode='file', forced=False):
             # or just doing nothing, when neither
             # compression nor compilation is enabled
             return self.content
+        # Shortcurcuit in case the content is empty.
+        if not content:
+            return ''
         # Then check for the appropriate output method and call it
         output_func = getattr(self, "output_%s" % mode, None)
         if callable(output_func):

diff --git a/compressor/templatetags/compress.py b/compressor/templatetags/compress.py
@@ -55,9 +55,6 @@ def render(self, context, forced=False):
             if content:
                 return content
         content = self.nodelist.render(context)
-        if (not settings.COMPRESS_ENABLED or
-                not len(content.strip())) and not forced:
-            return content
         compressor = self.compressor_cls(content)
         cachekey = self.cache_key(compressor)
         output = self.cache_get(cachekey)