Monotone-Parent: 08887e8ab8ffface427b76d3b4c8103b06bad176

Monotone-Revision: d23ffdb26b88012981424a2080e8ef01316372e0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-03T15:59:05
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-10-03 15:59:05 +00:00
parent 0f212d7366
commit 86ee24564d
1 changed files with 16 additions and 15 deletions

View File

@ -344,9 +344,9 @@ static BOOL debugObjectAllocation = NO;
[self _setupLocaleInContext:_ctx]; [self _setupLocaleInContext:_ctx];
/* first check attributes directly bound to the application */ /* first check attributes directly bound to the application */
if ((obj = [super lookupName:_key inContext:_ctx acquire:_flag])) obj = [super lookupName:_key inContext:_ctx acquire:_flag];
return obj; if (!obj)
{
/* /*
The problem is, that at this point we still get request for resources, The problem is, that at this point we still get request for resources,
eg 'favicon.ico'. eg 'favicon.ico'.
@ -355,13 +355,14 @@ static BOOL debugObjectAllocation = NO;
no method was provided in the query path. no method was provided in the query path.
*/ */
if ([_key isEqualToString:@"favicon.ico"]) if (![_key isEqualToString:@"favicon.ico"])
return nil; {
if ([self isUserName: _key inContext: _ctx])
obj = [self lookupUser: _key inContext: _ctx];
}
}
if ([self isUserName:_key inContext:_ctx]) return obj;
return [self lookupUser:_key inContext:_ctx];
return nil;
} }
/* WebDAV */ /* WebDAV */