From 862e358b57fde74595420e7948bf44fdadf690dc Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Wed, 8 Jul 2015 15:48:13 +0100
Subject: [PATCH] Refine check for client server plugins

Fixes #1870
---
 core/modules/commands/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
index 6caf2fefb..e2ba31347 100644
--- a/core/modules/commands/server.js
+++ b/core/modules/commands/server.js
@@ -301,7 +301,7 @@ Command.prototype.execute = function() {
 	console.log("Serving on " + host + ":" + port);
 	console.log("(press ctrl-C to exit)");
 	// Warn if required plugins are missing
-	if($tw.boot.wikiInfo.plugins.indexOf("tiddlywiki/tiddlyweb") === -1 || $tw.boot.wikiInfo.plugins.indexOf("tiddlywiki/filesystem") === -1) {
+	if(!$tw.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !$tw.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) {
 		$tw.utils.warning("Warning: Plugins required for client-server operation (\"tiddlywiki/filesystem\" and \"tiddlywiki/tiddlyweb\") are missing from tiddlywiki.info file");
 	}
 	return null;