Upgrade to 3.2.5

This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions

View File

@@ -115,7 +115,7 @@ return [
return $file->url(true);
},
],
'type' => File::class,
'type' => 'Kirby\Cms\File',
'views' => [
'default' => [
'content',

View File

@@ -20,7 +20,7 @@ return [
return $blueprint->title();
},
],
'type' => FileBlueprint::class,
'type' => 'Kirby\Cms\FileBlueprint',
'views' => [
],
];

View File

@@ -44,7 +44,7 @@ return [
return $file->url(true);
},
],
'type' => FileVersion::class,
'type' => 'Kirby\Cms\FileVersion',
'views' => [
'default' => [
'dimensions',

View File

@@ -29,7 +29,7 @@ return [
return $language->url();
},
],
'type' => Language::class,
'type' => 'Kirby\Cms\Language',
'views' => [
'compact' => [
'code',

View File

@@ -104,7 +104,7 @@ return [
return $page->url();
},
],
'type' => Page::class,
'type' => 'Kirby\Cms\Page',
'views' => [
'compact' => [
'id',

View File

@@ -29,7 +29,7 @@ return [
return $blueprint->title();
},
],
'type' => PageBlueprint::class,
'type' => 'Kirby\Cms\PageBlueprint',
'views' => [
],
];

View File

@@ -20,7 +20,7 @@ return [
return $role->title();
},
],
'type' => Role::class,
'type' => 'Kirby\Cms\Role',
'views' => [
'compact' => [
'description',

View File

@@ -39,7 +39,7 @@ return [
return $site->url();
},
],
'type' => Site::class,
'type' => 'Kirby\Cms\Site',
'views' => [
'compact' => [
'title',

View File

@@ -20,7 +20,7 @@ return [
return $blueprint->title();
},
],
'type' => SiteBlueprint::class,
'type' => 'Kirby\Cms\SiteBlueprint',
'views' => [
],
];

View File

@@ -11,6 +11,9 @@ return [
'ascii' => function () {
return Str::$ascii;
},
'defaultLanguage' => function () {
return $this->kirby()->option('panel.language', 'en');
},
'isOk' => function (System $system) {
return $system->isOk();
},
@@ -62,7 +65,7 @@ return [
}
},
'kirbytext' => function () {
return $this->kirby()->option('panel')['kirbytext'] ?? true;
return $this->kirby()->option('panel.kirbytext') ?? true;
},
'user' => function () {
return $this->user();
@@ -71,7 +74,7 @@ return [
return $this->kirby()->version();
}
],
'type' => System::class,
'type' => 'Kirby\Cms\System',
'views' => [
'login' => [
'isOk',
@@ -90,6 +93,7 @@ return [
],
'panel' => [
'ascii',
'defaultLanguage',
'isOk',
'isInstalled',
'isLocal',

View File

@@ -23,7 +23,7 @@ return [
return $translation->name();
},
],
'type' => Translation::class,
'type' => 'Kirby\Cms\Translation',
'views' => [
'compact' => [
'direction',

View File

@@ -54,7 +54,7 @@ return [
return $user->username();
}
],
'type' => User::class,
'type' => 'Kirby\Cms\User',
'views' => [
'default' => [
'avatar',

View File

@@ -20,7 +20,7 @@ return [
return $blueprint->title();
},
],
'type' => UserBlueprint::class,
'type' => 'Kirby\Cms\UserBlueprint',
'views' => [
],
];