Merge branch 'category-fixes' into unittests

maxme · maxme · commit 1e901ebd773a · 2013-08-09T15:09:04.000+02:00
diff --git a/src/org/wordpress/android/models/CategoryNode.java b/src/org/wordpress/android/models/CategoryNode.java
@@ -79,7 +79,7 @@ public static CategoryNode createCategoryTreeFromDB(int blogId) {
             if (category.getParentId() == 0) { // root node
                 currentRootNode = rootCategory;
             } else {
-                currentRootNode = categoryMap.get(category.getParentId());
+                currentRootNode = categoryMap.get(category.getParentId(), rootCategory);
             }
             currentRootNode.children.put(category.getName(), categoryMap.get(category.getCategoryId()));
         }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public static CategoryNode createCategoryTreeFromDB(int blogId) {`
`79`	`79`	`if (category.getParentId() == 0) { // root node`
`80`	`80`	`currentRootNode = rootCategory;`
`81`	`81`	`} else {`
`82`		`- currentRootNode = categoryMap.get(category.getParentId());`
	`82`	`+ currentRootNode = categoryMap.get(category.getParentId(), rootCategory);`
`83`	`83`	`}`
`84`	`84`	`currentRootNode.children.put(category.getName(), categoryMap.get(category.getCategoryId()));`
`85`	`85`	`}`