From 7a15b6f97abd8de040f0f6d256e67768f5246ca4 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 31 Aug 2012 15:09:33 +0100
Subject: [PATCH] Fixed mis-renaming of `tiddlywiki.files`

---
 core/boot.js                                                | 6 +++---
 .../esprima/{tiddlywiki.files.plugin => tiddlywiki.files}   | 0
 core/styles/{tiddlywiki.files.plugin => tiddlywiki.files}   | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename core/modules/parsers/javascriptparser/esprima/{tiddlywiki.files.plugin => tiddlywiki.files} (100%)
 rename core/styles/{tiddlywiki.files.plugin => tiddlywiki.files} (100%)

diff --git a/core/boot.js b/core/boot.js
index cb4077220..7a3da70e6 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -661,9 +661,9 @@ $tw.loadTiddlersFromFolder = function(filepath,basetitle,excludeRegExp,isShadow)
 			// Look for a tiddlywiki.files file
 			if(files.indexOf("tiddlywiki.files") !== -1) {
 				// If so, process the files it describes
-				var pluginInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.files").toString("utf8"));
-				for(var p=0; p<pluginInfo.tiddlers.length; p++) {
-					var tidInfo = pluginInfo.tiddlers[p],
+				var filesInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.files").toString("utf8"));
+				for(var p=0; p<filesInfo.tiddlers.length; p++) {
+					var tidInfo = filesInfo.tiddlers[p],
 						typeInfo = $tw.config.contentTypeInfo[tidInfo.fields.type || "text/plain"],
 						text = fs.readFileSync(path.resolve(filepath,tidInfo.file)).toString(typeInfo ? typeInfo.encoding : "utf8");
 					$tw.wiki.addTiddler(new $tw.Tiddler({text: text},tidInfo.fields),isShadow);
diff --git a/core/modules/parsers/javascriptparser/esprima/tiddlywiki.files.plugin b/core/modules/parsers/javascriptparser/esprima/tiddlywiki.files
similarity index 100%
rename from core/modules/parsers/javascriptparser/esprima/tiddlywiki.files.plugin
rename to core/modules/parsers/javascriptparser/esprima/tiddlywiki.files
diff --git a/core/styles/tiddlywiki.files.plugin b/core/styles/tiddlywiki.files
similarity index 100%
rename from core/styles/tiddlywiki.files.plugin
rename to core/styles/tiddlywiki.files