Skip to content

Commit

Permalink
Refs #5368 - fix 500 error
Browse files Browse the repository at this point in the history
  • Loading branch information
trawick committed Jan 3, 2017
1 parent 15d8436 commit ff20cde
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compressor/__init__.py
@@ -1,2 +1,2 @@
# following PEP 386
__version__ = "2.1"
__version__ = "2.1.0.1"
3 changes: 2 additions & 1 deletion compressor/base.py
Expand Up @@ -339,7 +339,8 @@ def render_output(self, mode, context=None):

self.context['compressed'].update(context or {})
self.context['compressed'].update(self.extra_context)
if hasattr(self.context, 'flatten'):
# #5368 - disable this call to flatten(), can result in 500 error
if False and hasattr(self.context, 'flatten'):
# Django 1.8 complains about Context being passed to its
# Template.render function.
final_context = self.context.flatten()
Expand Down

0 comments on commit ff20cde

Please sign in to comment.