From 471b73158a887d2f060194741739c1da8b5d44d8 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Wed, 28 Aug 2019 14:44:46 +0100
Subject: [PATCH] Fix overeager alerts from core module overwrite upgrade
 warning

This fixes a bug in #3634, and refines the logic so that the warning is only given if the incoming tiddler exists as a shadow tiddler. (In my case I have several draft core modules inactive in my notes wiki and they were erroneously suppressed from the upgrade).
---
 core/modules/upgraders/system.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/modules/upgraders/system.js b/core/modules/upgraders/system.js
index fb6e1dd0c..de7c48f52 100644
--- a/core/modules/upgraders/system.js
+++ b/core/modules/upgraders/system.js
@@ -35,17 +35,17 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 			}
 			for(var t=0; t<WARN_IMPORT_PREFIX_LIST.length; t++) {
 				var prefix = WARN_IMPORT_PREFIX_LIST[t];
-				if(title.substr(0,prefix.length) === prefix) {
+				if(title.substr(0,prefix.length) === prefix && wiki.isShadowTiddler(title)) {
 					showAlert = true;
 					messages[title] = $tw.language.getString("Import/Upgrader/System/Warning");
 				}
 			}
 		}
-		if(showAlert) {
-			var logger = new $tw.utils.Logger("import");
-			logger.alert($tw.language.getString("Import/Upgrader/System/Alert"));
-		}
 	});
+	if(showAlert) {
+		var logger = new $tw.utils.Logger("import");
+		logger.alert($tw.language.getString("Import/Upgrader/System/Alert"));
+	}
 	return messages;
 };