summaryrefslogtreecommitdiffstats
path: root/settings/controller/appsettingscontroller.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-01-06 13:07:17 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-01-06 13:07:17 +0100
commitfc38d4cc813215a6761e671380f774095575b076 (patch)
tree8434a7ca9ab90f02eec7f5745ca5cb69ba136e14 /settings/controller/appsettingscontroller.php
parent6a3f69c2d043203a7650d16200accd0303430e09 (diff)
downloadnextcloud-server-fc38d4cc813215a6761e671380f774095575b076.tar.gz
nextcloud-server-fc38d4cc813215a6761e671380f774095575b076.zip
fixing wrong usage of license vs licence
Diffstat (limited to 'settings/controller/appsettingscontroller.php')
-rw-r--r--settings/controller/appsettingscontroller.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
index b9e60c376de..3688859ef56 100644
--- a/settings/controller/appsettingscontroller.php
+++ b/settings/controller/appsettingscontroller.php
@@ -120,6 +120,8 @@ class AppSettingsController extends Controller {
// fix groups to be an array
$dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n);
$apps = array_map(function($app) use ($dependencyAnalyzer) {
+
+ // fix groups
$groups = array();
if (is_string($app['groups'])) {
$groups = json_decode($app['groups']);
@@ -127,11 +129,16 @@ class AppSettingsController extends Controller {
$app['groups'] = $groups;
$app['canUnInstall'] = !$app['active'] && $app['removable'];
+ // fix licence vs license
+ if (isset($app['license']) && !isset($app['licence'])) {
+ $app['licence'] = $app['license'];
+ }
+
// analyse dependencies
$missing = $dependencyAnalyzer->analyze($app);
-
$app['canInstall'] = empty($missing);
$app['missingDependencies'] = $missing;
+
return $app;
}, $apps);