From b31c9288987059d7423eadfee70fb13160edf7e0 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sun, 26 Feb 2017 23:59:54 +0100 Subject: [PATCH] Only change cert on merged site if different --- plugins/MergerSite/MergerSitePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/MergerSite/MergerSitePlugin.py b/plugins/MergerSite/MergerSitePlugin.py index 3469af99..2fad78ed 100644 --- a/plugins/MergerSite/MergerSitePlugin.py +++ b/plugins/MergerSite/MergerSitePlugin.py @@ -128,7 +128,7 @@ class UiWebsocketPlugin(object): # Set the same cert for merged site merger_cert = self.user.getSiteData(self.site.address).get("cert") - if merger_cert: + if merger_cert and self.user.getSiteData(merged_address).get("cert") != merger_cert: self.user.setCert(merged_address, merger_cert) site_before = self.site # Save to be able to change it back after we ran the command