From 09214d1c33db8f69d3ef81f85fc02907227b189d Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Mon, 31 Mar 2014 12:46:10 +0100
Subject: [PATCH] Fix problem with `--load` command overwriting `$:/core`

Now we use the `wiki.importTiddler()` method - it rejects attempts to
load older versions of loaded plugins
---
 core/language/en-GB/Help/load.tid | 2 ++
 core/modules/commands/load.js     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/language/en-GB/Help/load.tid b/core/language/en-GB/Help/load.tid
index 75c2eec6f..e1100250f 100644
--- a/core/language/en-GB/Help/load.tid
+++ b/core/language/en-GB/Help/load.tid
@@ -12,3 +12,5 @@ To load tiddlers from an encrypted TiddlyWiki file you should first specify the
 ```
 tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html
 ```
+
+Note that TiddlyWiki will not load an older version of an already loaded plugin.
diff --git a/core/modules/commands/load.js b/core/modules/commands/load.js
index 619417a9c..bc9cad0c0 100644
--- a/core/modules/commands/load.js
+++ b/core/modules/commands/load.js
@@ -41,7 +41,7 @@ Command.prototype.execute = function() {
 				self.callback("No tiddlers found in file \"" + self.params[0] + "\"");
 			} else {
 				for(var t=0; t<tiddlers.length; t++) {
-					self.commander.wiki.addTiddler(new $tw.Tiddler(tiddlers[t]));
+					self.commander.wiki.importTiddler(new $tw.Tiddler(tiddlers[t]));
 				}
 				self.callback(null);	
 			}