Prevent default filter from throwing UndefinedError when boolean flag is used with...

diff --git a/jinja2/filters.py b/jinja2/filters.py
index 8fef6eaa322b94f68e07a9c177b1cc4eea159eda..52a456b3e907777956b2185eaad4616ae5c6fcf9 100644 (file)
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@ -276,7 +276,7 @@ def do_default(value, default_value=u'', boolean=False):
 
         {{ ''|default('the string was empty', true) }}
     """
-    if (boolean and not value) or isinstance(value, Undefined):
+    if isinstance(value, Undefined) or (boolean and not value):
         return default_value
     return value
 

diff --git a/jinja2/testsuite/api.py b/jinja2/testsuite/api.py
index c8f96347c99989363ca2c06de9524bbb56ae1adc..4c2e42c39bdc405e07cf7e61e5986b24039bc0db 100644 (file)
--- a/jinja2/testsuite/api.py
+++ b/jinja2/testsuite/api.py
@@ -214,6 +214,7 @@ class UndefinedTestCase(JinjaTestCase):
         self.assert_equal(env.from_string('{{ missing is not defined }}').render(), 'True')
         self.assert_raises(UndefinedError, env.from_string('{{ foo.missing }}').render, foo=42)
         self.assert_raises(UndefinedError, env.from_string('{{ not missing }}').render)
+        self.assert_equal(env.from_string('{{ missing|default("default", true) }}').render(), 'default')
 
     def test_indexing_gives_undefined(self):
         t = Template("{{ var[42].foo }}")