Merge pull request #16811 from nextcloud/bugfix/16771/correctly-remove-apps-without-any-releases

rullzer · web-flow · commit dd02920aedc6 · 2019-08-20T22:29:20.000+02:00
Correctly remove apps without any releases
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -115,6 +115,7 @@ protected function fetch($ETag, $content) {
 
 			if (empty($releases)) {
 				// Remove apps that don't have a matching release
+				$response['data'][$dataKey] = [];
 				continue;
 			}
 
@@ -136,7 +137,7 @@ protected function fetch($ETag, $content) {
 			}
 		}
 
-		$response['data'] = array_values($response['data']);
+		$response['data'] = array_values(array_filter($response['data']));
 		return $response;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ protected function fetch($ETag, $content) {`
`115`	`115`
`116`	`116`	`if (empty($releases)) {`
`117`	`117`	`// Remove apps that don't have a matching release`
	`118`	`+ $response['data'][$dataKey] = [];`
`118`	`119`	`continue;`
`119`	`120`	`}`
`120`	`121`
`@@ -136,7 +137,7 @@ protected function fetch($ETag, $content) {`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`
`139`		`- $response['data'] = array_values($response['data']);`
	`140`	`+ $response['data'] = array_values(array_filter($response['data']));`
`140`	`141`	`return $response;`
`141`	`142`	`}`
`142`	`143`