From 09cb8d860fdc8481bb74aebe2690f987fc9aefdd Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Thu, 22 Sep 2016 20:07:29 +0200 Subject: [bug] check if gEmailWizardLogger is already defined It looks like in newer versions of thunderbird it might be already defined. - Closes: #8464 --- chrome/content/accountWizard/accountWizard.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js index cca4ccb..cdd02f0 100644 --- a/chrome/content/accountWizard/accountWizard.js +++ b/chrome/content/accountWizard/accountWizard.js @@ -25,8 +25,10 @@ Components.utils.import("resource://gre/modules/osfile.jsm"); // from http://xyfer.blogspot.com/2005/01/javascript-regexp-email-validator.html var emailRE = /^[-_a-z0-9\'+*$^&%=~!?{}]+(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*@(?:[-a-z0-9.]+\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d+)?$/i; -Cu.import("resource:///modules/gloda/log4moz.js"); -let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard"); +if (typeof gEmailWizardLogger == "undefined") { + Cu.import("resource:///modules/gloda/log4moz.js"); + let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard"); +} var gStringsBundle; var gAccountWizardStringsBundle; -- cgit v1.2.3