Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
b88a0e70
Commit
b88a0e70
authored
9 years ago
by
Morris Jobke
Browse files
Options
Downloads
Plain Diff
Merge pull request #17231 from owncloud/add-missing-version-field
Add missing version field
parents
30f5fa42
ab4d5d20
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/private/ocsclient.php
+4
-4
4 additions, 4 deletions
lib/private/ocsclient.php
settings/controller/appsettingscontroller.php
+2
-2
2 additions, 2 deletions
settings/controller/appsettingscontroller.php
with
6 additions
and
6 deletions
lib/private/ocsclient.php
+
4
−
4
View file @
b88a0e70
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
settings/controller/appsettingscontroller.php
+
2
−
2
View file @
b88a0e70
...
...
@@ -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'
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment