From 5477457271349475f78778969a2e57a684b3e9c4 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 9 Dec 2010 19:15:02 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: ada8e59dc2acdffd7634acc70f3387a0f8e4e671 Monotone-Revision: d61deeadebd9f79f9603928dca395cad83167394 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-12-09T19:15:02 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 1 + UI/Common/UIxPageFrame.m | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62760f988..23c5c9735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * SoObject/SOGo/SQLSource.m - added SHA password hash support for SQL authentication sources. + * Added patch from bug #1048 2010-12-08 Francis Lachapelle diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index fe2985968..9a4c52564 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -458,9 +458,10 @@ if ([auth respondsToSelector: @selector (cookieNameInContext:)]) { sd = [SOGoSystemDefaults sharedSystemDefaults]; - canLogoff = (([[sd authenticationType] isEqualToString: @"cas"] - && [sd CASLogoutEnabled]) - || [[auth cookieNameInContext: context] length] > 0); + if ([[sd authenticationType] isEqualToString: @"cas"]) + canLogoff = [sd CASLogoutEnabled]; + else + canLogoff = [[auth cookieNameInContext: context] length] > 0; } else canLogoff = NO;