Django

Code

Changeset 5052

Show
Ignore:
Timestamp:
04/20/07 23:44:30 (2 years ago)
Author:
mtredinnick
Message:

Fixed #3749 -- Set the context correctly when using the "filter" template tag.
Thanks, Zak Johnson.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/AUTHORS

    r5051 r5052  
    114114    Baurzhan Ismagulov <ibr@radix50.net> 
    115115    jcrasta@gmail.com 
     116    Zak Johnson <zakj@nox.cx> 
    116117    Michael Josephson <http://www.sdjournal.com/> 
    117118    jpellerin@gmail.com 

  • django/trunk/django/template/defaulttags.py

    r5048 r5052  
    4242        output = self.nodelist.render(context) 
    4343        # apply filters 
    44         return self.filter_expr.resolve(Context({'var': output})) 
     44        context.update({'var': output}) 
     45        filtered = self.filter_expr.resolve(context) 
     46        context.pop() 
     47        return filtered 
    4548 
    4649class FirstOfNode(Node): 

  • django/trunk/tests/regressiontests/templates/tests.py

    r5048 r5052  
    260260            'filter02': ('{% filter upper %}django{% endfilter %}', {}, 'DJANGO'), 
    261261            'filter03': ('{% filter upper|lower %}django{% endfilter %}', {}, 'django'), 
     262            'filter04': ('{% filter cut:remove %}djangospam{% endfilter %}', {'remove': 'spam'}, 'django'), 
    262263 
    263264            ### FIRSTOF TAG ###########################################################