From d5b04c26886ffa20ea41503a1542d34227304762 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Sun, 12 Feb 2017 12:14:04 +0000
Subject: [PATCH] Fix problem with loading metafiles

This issue was introduced in 1b41b4468495bbe66f99345ee94a67346176deb7.

Fixes problem raised by @pmario in
https://github.com/Jermolene/TiddlyWiki5/commit/3708f6c8e4f4bf2ea1cb10b0
fa685888485f788a#commitcomment-20848240
---
 boot/boot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot.js b/boot/boot.js
index a03022cf7..e5128c225 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1475,7 +1475,7 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		metadata;
 	if(ext !== ".json" && tiddlers.length === 1) {
 		metadata = $tw.loadMetadataForFile(filepath);
-		tiddlers = [$tw.utils.extend({},metadata,tiddlers[0])];
+		tiddlers = [$tw.utils.extend({},tiddlers[0],metadata)];
 	}
 	return {filepath: filepath, type: type, tiddlers: tiddlers, hasMetaFile: !!metadata};
 };