From abc29c3fbaa2579f8f7c1f7ec0cef5b4241d7271 Mon Sep 17 00:00:00 2001
From: Samy Pesse <samypesse@gmail.com>
Date: Thu, 18 Jun 2015 11:11:47 +0200
Subject: [PATCH] Fix #804: correctly extract kwargs from blocks

---
 lib/template.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template.js b/lib/template.js
index 3e6364d17..3a4985c44 100644
--- a/lib/template.js
+++ b/lib/template.js
@@ -250,7 +250,7 @@ TemplateEngine.prototype.addBlock = function(name, block) {
 
             // Extract main body and kwargs
             var body = args.pop();
-            var kwargs = args.pop() || {};
+            var kwargs = _.isObject(_.last(args))? args.pop() : {};
 
             // Extract blocks body
             var _blocks =  _.map(block.blocks, function(blockName, i){