fix unintentional change to metadata merging

patrickarlt · Jan 15, 2016 · c682318 · c682318
1 parent e2c39d7
commit c682318
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 [Upcoming Changes](https://github.com/patrickarlt/acetate/compare/v0.4.3...master)
 
+## [0.4.6] - 2016-01-014
+
+### Fixed
+
+* Restore unintentional change to metadata merging.
+
 ## [0.4.5] - 2016-01-014
 
 ### Fixed

diff --git a/lib/extensions/metadata.js b/lib/extensions/metadata.js
@@ -9,7 +9,7 @@ module.exports = function (glob, data) {
 
     _.each(acetate.pages, function (page) {
       if (pattern.match(page.src)) {
-        _.merge(page, data);
+        _.merge(page, data, page.metadata);
       }
     });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "acetate",
   "description": "Layout and templating framework for static websites.",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "author": "Patrick Arlt",
   "bugs": {
     "url": "https://github.com/patrickarlt/acetate/issues"