fixing wrong usage of license vs licence
This commit is contained in:
parent
6a3f69c2d0
commit
fc38d4cc81
|
@ -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);
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
<h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
|
||||
<div class="app-version"> {{version}}</div>
|
||||
<div class="app-author"><?php p($l->t('by')); ?> {{author}}
|
||||
{{#if license}}
|
||||
({{license}}-<?php p($l->t('licensed')); ?>)
|
||||
{{#if licence}}
|
||||
({{licence}}-<?php p($l->t('licensed')); ?>)
|
||||
{{/if}}
|
||||
</div>
|
||||
{{#if score}}
|
||||
|
|
Loading…
Reference in New Issue