Skip to content
Snippets Groups Projects
Commit b88a0e70 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #17231 from owncloud/add-missing-version-field

Add missing version field
parents 30f5fa42 ab4d5d20
Branches
No related tags found
No related merge requests found
...@@ -111,7 +111,7 @@ class OCSClient { ...@@ -111,7 +111,7 @@ class OCSClient {
* @note returns NULL if config value appstoreenabled is set to false * @note returns NULL if config value appstoreenabled is set to false
* This function returns a list of all the application categories on the OCS server * This function returns a list of all the application categories on the OCS server
*/ */
public function getCategories($targetVersion) { public function getCategories(array $targetVersion) {
if (!$this->isAppStoreEnabled()) { if (!$this->isAppStoreEnabled()) {
return null; return null;
} }
...@@ -162,7 +162,7 @@ class OCSClient { ...@@ -162,7 +162,7 @@ class OCSClient {
* @param array $targetVersion The target ownCloud version * @param array $targetVersion The target ownCloud version
* @return array An array of application data * @return array An array of application data
*/ */
public function getApplications(array $categories, $page, $filter, $targetVersion) { public function getApplications(array $categories, $page, $filter, array $targetVersion) {
if (!$this->isAppStoreEnabled()) { if (!$this->isAppStoreEnabled()) {
return []; return [];
} }
...@@ -239,7 +239,7 @@ class OCSClient { ...@@ -239,7 +239,7 @@ class OCSClient {
* *
* This function returns an applications from the OCS server * This function returns an applications from the OCS server
*/ */
public function getApplication($id, $targetVersion) { public function getApplication($id, array $targetVersion) {
if (!$this->isAppStoreEnabled()) { if (!$this->isAppStoreEnabled()) {
return null; return null;
} }
...@@ -304,7 +304,7 @@ class OCSClient { ...@@ -304,7 +304,7 @@ class OCSClient {
* @param array $targetVersion The target ownCloud version * @param array $targetVersion The target ownCloud version
* @return array|null an array of application data or null * @return array|null an array of application data or null
*/ */
public function getApplicationDownload($id, $targetVersion) { public function getApplicationDownload($id, array $targetVersion) {
if (!$this->isAppStoreEnabled()) { if (!$this->isAppStoreEnabled()) {
return null; return null;
} }
......
...@@ -171,7 +171,7 @@ class AppSettingsController extends Controller { ...@@ -171,7 +171,7 @@ class AppSettingsController extends Controller {
}); });
foreach($apps as $key => $app) { foreach($apps as $key => $app) {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) { if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid']); $remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion());
if(array_key_exists('level', $remoteAppEntry)) { if(array_key_exists('level', $remoteAppEntry)) {
$apps[$key]['level'] = $remoteAppEntry['level']; $apps[$key]['level'] = $remoteAppEntry['level'];
...@@ -187,7 +187,7 @@ class AppSettingsController extends Controller { ...@@ -187,7 +187,7 @@ class AppSettingsController extends Controller {
}); });
foreach($apps as $key => $app) { foreach($apps as $key => $app) {
if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) { if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
$remoteAppEntry = $this->ocsClient->getApplication($app['ocsid']); $remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], \OC_Util::getVersion());
if(array_key_exists('level', $remoteAppEntry)) { if(array_key_exists('level', $remoteAppEntry)) {
$apps[$key]['level'] = $remoteAppEntry['level']; $apps[$key]['level'] = $remoteAppEntry['level'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment