Monotone-Parent: 08887e8ab8ffface427b76d3b4c8103b06bad176
Monotone-Revision: d23ffdb26b88012981424a2080e8ef01316372e0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-10-03T15:59:05 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
0f212d7366
commit
86ee24564d
17
Main/SOGo.m
17
Main/SOGo.m
|
@ -344,9 +344,9 @@ static BOOL debugObjectAllocation = NO;
|
|||
[self _setupLocaleInContext:_ctx];
|
||||
|
||||
/* first check attributes directly bound to the application */
|
||||
if ((obj = [super lookupName:_key inContext:_ctx acquire:_flag]))
|
||||
return obj;
|
||||
|
||||
obj = [super lookupName:_key inContext:_ctx acquire:_flag];
|
||||
if (!obj)
|
||||
{
|
||||
/*
|
||||
The problem is, that at this point we still get request for resources,
|
||||
eg 'favicon.ico'.
|
||||
|
@ -355,13 +355,14 @@ static BOOL debugObjectAllocation = NO;
|
|||
no method was provided in the query path.
|
||||
*/
|
||||
|
||||
if ([_key isEqualToString:@"favicon.ico"])
|
||||
return nil;
|
||||
|
||||
if (![_key isEqualToString:@"favicon.ico"])
|
||||
{
|
||||
if ([self isUserName: _key inContext: _ctx])
|
||||
return [self lookupUser:_key inContext:_ctx];
|
||||
obj = [self lookupUser: _key inContext: _ctx];
|
||||
}
|
||||
}
|
||||
|
||||
return nil;
|
||||
return obj;
|
||||
}
|
||||
|
||||
/* WebDAV */
|
||||
|
|
Loading…
Reference in New Issue