Merge commit '144f5a64cdd4df805343bf0e5912f2eda98191bc' into develop

maksis · maksis · commit ec8f3bced38f · 2016-01-25T15:53:37.000+02:00
diff --git a/airdcpp-webapi/api/FilelistApi.cpp b/airdcpp-webapi/api/FilelistApi.cpp
@@ -156,7 +156,7 @@ namespace webserver {
 			{ "total_files", totalFiles },
 			{ "total_size", totalSize },
 			{ "read", aList->isRead() },
-			{ "share_profile", aList->getIsOwnList() ? Serializer::serializeShareProfileSimple(aList->getShareProfile()) : nullptr },
+			{ "share_profile", aList->getIsOwnList() ? Serializer::serializeShareProfileSimple(aList->getShareProfile()) : json() },
 		};
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ namespace webserver {`
`156`	`156`	`{ "total_files", totalFiles },`
`157`	`157`	`{ "total_size", totalSize },`
`158`	`158`	`{ "read", aList->isRead() },`
`159`		`- { "share_profile", aList->getIsOwnList() ? Serializer::serializeShareProfileSimple(aList->getShareProfile()) : nullptr },`
	`159`	`+ { "share_profile", aList->getIsOwnList() ? Serializer::serializeShareProfileSimple(aList->getShareProfile()) : json() },`
`160`	`160`	`};`
`161`	`161`	`}`
`162`	`162`