From 9caf03820b3952a2484615e2291bc10d141b8c97 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 18 Oct 2011 19:09:19 +0000
Subject: [PATCH] Fix for bug #1438. See ChangeLog.

Monotone-Parent: f770d812a46b526af6dd29630df45683a5bf503d
Monotone-Revision: c98e3872a8bdd768ed6e254e52f9956140773146

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-18T19:09:19
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        | 3 +++
 UI/WebServerResources/generic.js | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65ffdd9db..c2cdd8b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-18  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/generic.js (log): fixed an issue with
+	Firefox and IE when SOGo was opened using a targeted link.
+
 	* SoObjects/Mailer/SOGoMailFolder.m
 	(-copyUIDs:toFolder:inContext:): now returns the raw IMAP response
 	when the copy operation failed (most probably something like "Over quota").
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d1584d020..b687b2ed9 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -804,8 +804,11 @@ function toggleLogConsole(event) {
 function log(message) {
     if (!logWindow) {
         logWindow = window;
-        while (logWindow.opener)
-            logWindow = logWindow.opener;
+        try {
+            while (logWindow.opener && logWindow.opener_logMessage)
+                logWindow = logWindow.opener;
+        }
+        catch(e) {}
     }
     if (logWindow && logWindow._logMessage) {
         var logMessage = message;