Ticket #2619: simple_tag_set_context_r3680.diff

__init__.py

@@ -828 +828 @@
 
             def render(self, context):
                 resolved_vars = [resolve_variable(var, context) for var in self.vars_to_resolve]
-                return func(*resolved_vars)
+                func_ret = func(*resolved_vars)
+                if isinstance(func_ret, dict):
+                    context.update(func_ret)
+                    return ''
+                return func_ret
 
         compile_func = curry(generic_tag_compiler, params, defaults, func.__name__, SimpleNode)
         compile_func.__doc__ = func.__doc__