From 6bc3b47bf41d38f0f4608ff7e7097dedf73b8171 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 10 Jun 2010 18:44:38 +0000 Subject: [PATCH] Monotone-Parent: a1b9a10da6c763d93711deaf538e81314618e5e7 Monotone-Revision: 18464c2d77d4979f1c50fac4f095dcf6dcb967c1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-10T18:44:38 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/NSString+Utilities.m | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7428f934f..a842fb3d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-06-10 Wolfgang Sourdeau + * SoObjects/SOGo/NSString+Utilities.m + (-composeURLWithAction:parameters:andHash:): don't attempt to add + parameters if the parameters argument is empty. + * UI/Common/UIxPageFrame.m (-canLogoff)): return YES when the authentication type is set to "cas" and SOGoCASLogoutEnabled is set. diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index 48a9c7ee9..d56c317f7 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -59,7 +59,8 @@ static int cssEscapingCount; if (![completeURL hasSuffix: @"/"]) [completeURL appendString: @"/"]; [completeURL appendString: action]; - [completeURL appendString: [urlParameters asURLParameters]]; + if (urlParameters) + [completeURL appendString: [urlParameters asURLParameters]]; if (useHash) [completeURL appendString: @"#"];