diff --git a/ChangeLog b/ChangeLog index 5e91a1ae2..7a25eb33d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-15 Fred Kiefer + + * Source/NSString.m (-initWithCoder:): Handle format used for XIB encoding. + 2010-03-14 Adam Fedor * Source/NSHTTPCookie.m (+requestHeaderFieldsWithCookies:): diff --git a/Source/NSString.m b/Source/NSString.m index 2f26a757b..6d59da438 100644 --- a/Source/NSString.m +++ b/Source/NSString.m @@ -4611,8 +4611,18 @@ static NSFileManager *fm = nil; { if ([aCoder allowsKeyedCoding]) { - NSString *string = (NSString*)[(NSKeyedUnarchiver*)aCoder - _decodePropertyListForKey: @"NS.string"]; + NSString *string = nil; + + if ([aCoder containsValueForKey: @"NS.string"]) + { + string = (NSString*)[(NSKeyedUnarchiver*)aCoder + _decodePropertyListForKey: @"NS.string"]; + } + else if ([aCoder containsValueForKey: @"NS.bytes"]) + { + string = (NSString*)[(NSKeyedUnarchiver*)aCoder + decodeObjectForKey: @"NS.bytes"]; + } self = [self initWithString: string]; }