summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-06-18 11:16:32 +0200
committerSamy Pessé <samypesse@gmail.com>2015-06-18 11:16:32 +0200
commit50c902c4e481e8d1321e734d8912d1b285fc4f3c (patch)
tree8be7e07101270c48b0fef236974af8ea8a978e56 /lib
parent78ff2687b4fe1dc7ba2817caa9e4a8426b5ebde2 (diff)
parent84b6e0bde6547421b3b42bb9a1754ae980c8aea1 (diff)
downloadgitbook-50c902c4e481e8d1321e734d8912d1b285fc4f3c.zip
gitbook-50c902c4e481e8d1321e734d8912d1b285fc4f3c.tar.gz
gitbook-50c902c4e481e8d1321e734d8912d1b285fc4f3c.tar.bz2
Merge pull request #805 from GitbookIO/fix/804
Fix #804
Diffstat (limited to 'lib')
-rw-r--r--lib/template.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/template.js b/lib/template.js
index 3e6364d..3a4985c 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){