From cc098ecdf7685ccf42e84241f5b190230c907025 Mon Sep 17 00:00:00 2001
From: Geoff Kimball <geoff@zurb.com>
Date: Sun, 15 Nov 2015 12:28:59 -0800
Subject: [PATCH] Make data imported from external files available globally

---
 lib/render.js                  | 4 ++--
 test/fixtures/pages/index.html | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/render.js b/lib/render.js
index 5e872a0..2f022bc 100644
--- a/lib/render.js
+++ b/lib/render.js
@@ -32,9 +32,9 @@ module.exports = function(file, enc, cb) {
   pageData = page.attributes;
   pageData = extend(pageData, {
     page: path.basename(file.path, '.html'),
-    root: processRoot(file.path, this.options.root),
-    data: this.data
+    root: processRoot(file.path, this.options.root)
   });
+  pageData = extend(pageData, this.data);
 
   // Add special ad-hoc partials for #ifpage and #unlesspage
   this.Handlebars.registerHelper('ifpage', require('../helpers/ifPage')(pageData.page));
diff --git a/test/fixtures/pages/index.html b/test/fixtures/pages/index.html
index f7d11e5..82d08f1 100644
--- a/test/fixtures/pages/index.html
+++ b/test/fixtures/pages/index.html
@@ -17,3 +17,7 @@ <h2>Index file!</h2>
   <li>Item!</li>
   {{/repeat}}
 </ul>
+
+{{#each data}}
+  {{ this }}
+{{/each}}