summaryrefslogtreecommitdiffstats
path: root/lib/template.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-09-15 09:37:43 +0200
committerSamy Pessé <samypesse@gmail.com>2015-09-15 09:37:43 +0200
commitcceebb4fd979f4acc152de614fedab218de6c8a8 (patch)
treee8c74c3c7cace90d2b9fa152f7217d15e5827c5e /lib/template.js
parentafd5465a6129e96bce62dab26a4ee41e7af7365c (diff)
parentd699dff872a36b33719385ddf8b641afdc5bada1 (diff)
downloadgitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.zip
gitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.tar.gz
gitbook-cceebb4fd979f4acc152de614fedab218de6c8a8.tar.bz2
Merge branch 'improve/template-blocks'
Diffstat (limited to 'lib/template.js')
-rw-r--r--lib/template.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/template.js b/lib/template.js
index cc247c0..4b2035f 100644
--- a/lib/template.js
+++ b/lib/template.js
@@ -30,7 +30,7 @@ var BookLoader = nunjucks.Loader.extend({
git.resolveFile(fileurl)
.then(function(filepath) {
// Is local file
- if (!filepath) filepath = path.resolve(that.book.root, fileurl);
+ if (!filepath) filepath = that.book.resolve(fileurl);
else that.book.log.debug.ln("resolve from git", fileurl, "to", filepath)
// Read file from absolute path