diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-06-29 16:41:47 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-06-29 16:41:47 +0200 |
| commit | b88a0e7080cd5b1844cfb286b06744f3a2fead20 (patch) | |
| tree | a10bc657ace4f3a6848f147c634d8a8bf6482a16 | |
| parent | 30f5fa42e5969a8052026e092eaee2c8ed718a65 (diff) | |
| parent | ab4d5d20ea30f109bf35227fb2a611816afbf303 (diff) | |
| download | nextcloud-server-b88a0e7080cd5b1844cfb286b06744f3a2fead20.tar.gz nextcloud-server-b88a0e7080cd5b1844cfb286b06744f3a2fead20.zip | |
Merge pull request #17231 from owncloud/add-missing-version-field
Add missing version field
| -rw-r--r-- | lib/private/ocsclient.php | 8 | ||||
| -rw-r--r-- | settings/controller/appsettingscontroller.php | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index 9fd3bb13733..18ba4cea003 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -111,7 +111,7 @@ class OCSClient { * @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 */ - public function getCategories($targetVersion) { + public function getCategories(array $targetVersion) { if (!$this->isAppStoreEnabled()) { return null; } @@ -162,7 +162,7 @@ class OCSClient { * @param array $targetVersion The target ownCloud version * @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()) { return []; } @@ -239,7 +239,7 @@ class OCSClient { * * This function returns an applications from the OCS server */ - public function getApplication($id, $targetVersion) { + public function getApplication($id, array $targetVersion) { if (!$this->isAppStoreEnabled()) { return null; } @@ -304,7 +304,7 @@ class OCSClient { * @param array $targetVersion The target ownCloud version * @return array|null an array of application data or null */ - public function getApplicationDownload($id, $targetVersion) { + public function getApplicationDownload($id, array $targetVersion) { if (!$this->isAppStoreEnabled()) { return null; } diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index f62ced23ff8..6803985d5db 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -171,7 +171,7 @@ class AppSettingsController extends Controller { }); foreach($apps as $key => $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)) { $apps[$key]['level'] = $remoteAppEntry['level']; @@ -187,7 +187,7 @@ class AppSettingsController extends Controller { }); foreach($apps as $key => $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)) { $apps[$key]['level'] = $remoteAppEntry['level']; |