summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-09-22 20:07:29 +0200
committerRuben Pollan <meskio@sindominio.net>2016-09-22 20:07:29 +0200
commit09cb8d860fdc8481bb74aebe2690f987fc9aefdd (patch)
treea189b98ac3b4eb4271aba7597f57296564d6e7ea
parent476d88be6ecc464e111a66bc9466315d592cb76e (diff)
[bug] check if gEmailWizardLogger is already defined
It looks like in newer versions of thunderbird it might be already defined. - Closes: #8464
-rw-r--r--chrome/content/accountWizard/accountWizard.js6
1 files 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;