From ac54fe33263cbe48bc294f9c14257ccc146be38e Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Mon, 8 Sep 2014 19:50:48 +0100
Subject: [PATCH] Disable plugins in safe mode

Fixes #820
---
 boot/boot.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/boot.js b/boot/boot.js
index 32294c881..e6f1b21c2 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1103,7 +1103,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	// Assemble a report tiddler
 	var titleReportTiddler = "TiddlyWiki Safe Mode",
 		report = [];
-	report.push("TiddlyWiki has been started in [[safe mode|http://tiddlywiki.com/static/SafeMode.html]]. Most customisations have been disabled by renaming the following tiddlers:")
+	report.push("TiddlyWiki has been started in [[safe mode|http://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:")
 	// Delete the overrides
 	overrides.forEach(function(title) {
 		var tiddler = self.getTiddler(title),
@@ -1752,7 +1752,7 @@ $tw.boot.startup = function(options) {
 	}
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
-	$tw.wiki.registerPluginTiddlers("plugin");
+	$tw.wiki.registerPluginTiddlers("plugin",$tw.safeMode ? ["$:/core"] : undefined);
 	$tw.wiki.unpackPluginTiddlers();
 	// Process "safe mode"
 	if($tw.safeMode) {