From 1db047a33604ba7df915b8776076db69e3166120 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 29 Jun 2015 15:09:57 +0200
Subject: Add missing version field

---
 settings/controller/appsettingscontroller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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'];
-- 
cgit v1.2.3


From ab4d5d20ea30f109bf35227fb2a611816afbf303 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 29 Jun 2015 15:10:40 +0200
Subject: Typehint $targetVersion

---
 lib/private/ocsclient.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 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;
 		}
-- 
cgit v1.2.3