Merge branch 'develop' for circular reference fix on JSONAPIResource

Ricardo Pramana Suranta · Ricardo Pramana Suranta · commit 7550b7da1e02 · 2015-06-03T13:12:02.000+07:00
diff --git a/Classes/JSONAPI.m b/Classes/JSONAPI.m
@@ -134,7 +134,6 @@ - (void)inflateWithDictionary:(NSDictionary*)dictionary {
     _includedResources = includedResources;
     
     // Link included with included
-    // TODO: Need to look into / stop circular references
     for (NSDictionary *typeIncluded in _includedResources.allValues) {
         for (JSONAPIResource *resource in typeIncluded.allValues) {
             [resource linkWithIncluded:self];
diff --git a/Classes/JSONAPIResource.m b/Classes/JSONAPIResource.m
@@ -172,7 +172,7 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {
                         
                         JSONAPIResource *linkedResource = included[linkType][linksToId];
                         if (linkedResource != nil) {
-                            [linkedResources addObject:linkedResources];
+                            [linkedResources addObject:linkedResource];
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ - (void)linkWithIncluded:(JSONAPI*)jsonAPI {`
`172`	`172`
`173`	`173`	`JSONAPIResource *linkedResource = included[linkType][linksToId];`
`174`	`174`	`if (linkedResource != nil) {`
`175`		`- [linkedResources addObject:linkedResources];`
	`175`	`+ [linkedResources addObject:linkedResource];`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`}`