From: helge Date: Wed, 22 Sep 2004 13:38:51 +0000 (+0000) Subject: minor tweaks X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65ab30243e392f347513bbda928f84d67f6d9c44;p=sope minor tweaks git-svn-id: http://svn.opengroupware.org/SOPE/trunk@152 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m index ed8b35ab..4e48529d 100644 --- a/sope-appserver/NGObjWeb/OWResourceManager.m +++ b/sope-appserver/NGObjWeb/OWResourceManager.m @@ -1074,6 +1074,7 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) - (WOComponentDefinition *)definitionForComponent:(id)_name languages:(NSArray *)_langs { + /* Note: the framework will be determined base on the class '_name' */ return [self definitionForComponent:_name inFramework:nil languages:_langs]; } @@ -1126,6 +1127,7 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) /* TODO: this appears to be deprecated since the WOComponent initializer is now -initWithContext: and we have no context here ... + Also misses the framework? */ NSAutoreleasePool *pool = nil; WOComponentDefinition *cdef = nil; diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m index a8433ea5..d6f7411f 100644 --- a/sope-appserver/NGObjWeb/WOApplication.m +++ b/sope-appserver/NGObjWeb/WOApplication.m @@ -1024,7 +1024,7 @@ static NSString *rapidTurnAroundPath = nil; if ((rm = [[_ctx component] resourceManager]) == nil) rm = [self resourceManager]; - page = [rm pageWithName:(_name ? _name : @"Main") + page = [rm pageWithName:(_name != nil ? _name : @"Main") languages:languages]; [page ensureAwakeInContext:_ctx]; @@ -1056,7 +1056,7 @@ static NSString *rapidTurnAroundPath = nil; if ((rm = [self resourceManager]) == nil) return nil; - return [rm pageWithName:_name ? _name : @"Main" + return [rm pageWithName:(_name != nil) ? _name : @"Main" languages:[_req browserLanguages]]; }