upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

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

Browse source 
Add missing version field
This commit is contained in:
Morris Jobke 2015-06-29 16:41:47 +02:00
commit b88a0e7080
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/ocsclient.php
View file

@ -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;
}

4
settings/controller/appsettingscontroller.php
View file

@ -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'];