Fix problem with loading metafiles

This issue was introduced in 1b41b44684.

Fixes problem raised by @pmario in
https://github.com/Jermolene/TiddlyWiki5/commit/3708f6c8e4f4bf2ea1cb10b0
fa685888485f788a#commitcomment-20848240
print-window-tiddler
Jermolene 2017-02-12 12:14:04 +00:00
rodzic 7b251df989
commit d5b04c2688
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -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};
};