]> err.no Git - sope/commitdiff
minor tweaks
authorhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Wed, 22 Sep 2004 13:38:51 +0000 (13:38 +0000)
committerhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Wed, 22 Sep 2004 13:38:51 +0000 (13:38 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@152 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

sope-appserver/NGObjWeb/OWResourceManager.m
sope-appserver/NGObjWeb/WOApplication.m

index ed8b35abe08d6ddfae99df691fe8e9e5ae2bd792..4e48529d042a4c653ca36b39c474288ad00afab8 100644 (file)
@@ -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;
index a8433ea56fcb82031174fdc2e727fc86c993b0ef..d6f7411f0e6e53c528129208b5bb9f598223fe16 100644 (file)
@@ -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]];
 }