See ChangeLog.
Monotone-Parent: 18c4303d5fad2ad73c3df3a47c2ac2072cbcad5f Monotone-Revision: e42a3f349a672964c21581206e235de80ec76169 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-07-06T15:32:13 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
1e4120c605
commit
2688650537
|
@ -1,3 +1,9 @@
|
|||
2011-07-07 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/MainUI/SOGoUserHomePage.m (-_usersForResults:inDomain:):
|
||||
fixed bug when the domain was empty.
|
||||
(-usersSearchAction): idem.
|
||||
|
||||
2011-07-06 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/NSData+Mail.m (bodyDataFromEncoding:)
|
||||
|
|
|
@ -329,7 +329,7 @@
|
|||
BOOL activeUserIsInDomain;
|
||||
|
||||
login = [[context activeUser] login];
|
||||
activeUserIsInDomain = (domain == nil || [[[context activeUser] domain] isEqualToString: domain]);
|
||||
activeUserIsInDomain = ([domain length] == 0 || [[[context activeUser] domain] isEqualToString: domain]);
|
||||
|
||||
// We sort our array - this is pretty useful for the Web
|
||||
// interface of SOGo.
|
||||
|
@ -347,7 +347,7 @@
|
|||
if (!activeUserIsInDomain || ![uid isEqualToString: login])
|
||||
{
|
||||
jsonLine = [NSMutableArray arrayWithCapacity: 4];
|
||||
if (domain)
|
||||
if ([domain length])
|
||||
uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
|
||||
[jsonLine addObject: uid];
|
||||
[jsonLine addObject: [contact objectForKey: @"cn"]];
|
||||
|
@ -380,7 +380,7 @@
|
|||
users = [self _usersForResults: [um fetchUsersMatching: contact
|
||||
inDomain: domain]
|
||||
inDomain: domain];
|
||||
if (domain)
|
||||
if ([domain length])
|
||||
{
|
||||
// Add results from visible domains
|
||||
sd = [SOGoSystemDefaults sharedSystemDefaults];
|
||||
|
|
Loading…
Reference in New Issue