Fix for case where cached date is stored as an NSDictionary containing the ISO date.

Author: Phil Jacobsen

Parse/PFObject.m

@@ -1282,13 +1282,34 @@ - (void)_mergeAfterSaveWithResult:(NSDictionary *)result decoder:(PFDecoder *)de
     }
 }
 
+static NSString* ISO8601Format = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+// http://stackoverflow.com/questions/17558859/convert-iso-8601-to-nsdate
+static NSDate* NSDateFromISO8601String(NSString* dateString) {
+    
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:ISO8601Format];
+    // Always use this locale when parsing fixed format date strings
+    NSLocale *posix = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
+    [formatter setLocale:posix];
+    [formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
+    NSDate *date = [formatter dateFromString:dateString];
+    
+    return date;
+}
+
 - (void)_mergeFromServerWithResult:(NSDictionary *)result decoder:(PFDecoder *)decoder completeData:(BOOL)completeData {
     @synchronized (lock) {
         self._state = [self._state copyByMutatingWithBlock:^(PFMutableObjectState *state) {
             // If the server's data is complete, consider this object to be fetched.
             state.complete |= completeData;
 
             [result enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+                if ([obj isKindOfClass:[NSDictionary class]]) {
+                    if (([[obj valueForKey:@"__type"] isEqualToString:@"Date"]) &&
+                        ([obj valueForKey:@"iso"])) {
+                        obj = NSDateFromISO8601String([obj valueForKey:@"iso"]);
+                    }
+                }
                 if ([key isEqualToString:PFObjectObjectIdRESTKey]) {
                     state.objectId = obj;
                 } else if ([key isEqualToString:PFObjectCreatedAtRESTKey]) {