mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 10:07:19 +00:00
Code Issues Releases Wiki Activity

Fix problem with --load command overwriting $:/core

Browse Source 
Now we use the `wiki.importTiddler()` method - it rejects attempts to
load older versions of loaded plugins
This commit is contained in:
Jermolene 2014-03-31 12:46:10 +01:00
parent 914a536d82
commit 09214d1c33
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/language/en-GB/Help/load.tid
View File

@ -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.

2
core/modules/commands/load.js
View File

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