From b1fb0a2a070a6abc78564e56fdb4244076ac44ac Mon Sep 17 00:00:00 2001 From: TheDiveO Date: Fri, 26 Sep 2014 22:33:47 +0200 Subject: [PATCH] fix for broken plugin tiddlers that do not contain a tiddlers field; avoids runtime errors upstream when accessing subtiddlers inside a (broken) tiddler and when using the plugintiddlers filter operator. --- core/modules/filters/plugintiddlers.js | 2 +- core/modules/wiki.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/filters/plugintiddlers.js b/core/modules/filters/plugintiddlers.js index 9845e8ce8..abb20f8f9 100644 --- a/core/modules/filters/plugintiddlers.js +++ b/core/modules/filters/plugintiddlers.js @@ -19,7 +19,7 @@ exports.plugintiddlers = function(source,operator,options) { var results = []; source(function(tiddler,title) { var pluginInfo = options.wiki.getPluginInfo(title) || options.wiki.getTiddlerData(title,{tiddlers:[]}); - if(pluginInfo) { + if(pluginInfo && pluginInfo.tiddlers) { $tw.utils.each(pluginInfo.tiddlers,function(fields,title) { results.push(title); }); diff --git a/core/modules/wiki.js b/core/modules/wiki.js index 1f4bed260..e9df6b68c 100755 --- a/core/modules/wiki.js +++ b/core/modules/wiki.js @@ -570,7 +570,7 @@ exports.sortByList = function(array,listTitle) { exports.getSubTiddler = function(title,subTiddlerTitle) { var bundleInfo = this.getPluginInfo(title) || this.getTiddlerData(title); - if(bundleInfo) { + if(bundleInfo && bundleInfo.tiddlers) { var subTiddler = bundleInfo.tiddlers[subTiddlerTitle]; if(subTiddler) { return new $tw.Tiddler(subTiddler);