interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.0.2

Browse Source
This commit is contained in:
Bastian Allgeier
2019-02-19 16:39:58 +01:00
parent f76ee1bb14
commit 8e3d86a590
44 changed files with 638 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kirby/config/components.php
View File

@@ -14,7 +14,7 @@ use Kirby\Toolkit\F;
use Kirby\Toolkit\Tpl as Snippet;
return [
'file::version' => function (App $kirby, Model $file, array $options = []) {
'file::version' => function (App $kirby, $file, array $options = []) {
if ($file->isResizable() === false) {
return $file;
}
@@ -24,8 +24,7 @@ return [
$attributes = $darkroom->preprocess($file->root(), $options);
// create url and root
$parent = $file->parent();
$mediaRoot = $parent->mediaRoot() . '/' . $file->mediaHash();
$mediaRoot = dirname($file->mediaRoot());
$dst = $mediaRoot . '/{{ name }}{{ attributes }}.{{ extension }}';
$thumbRoot = (new Filename($file->root(), $dst, $attributes))->toString();
$thumbName = basename($thumbRoot);
@@ -45,10 +44,10 @@ return [
'modifications' => $options,
'original' => $file,
'root' => $thumbRoot,
'url' => $parent->mediaUrl() . '/' . $file->mediaHash() . '/' . $thumbName,
'url' => dirname($file->mediaUrl()) . '/' . $thumbName,
]);
},
'file::url' => function (App $kirby, Model $file) {
'file::url' => function (App $kirby, $file) {
return $file->mediaUrl();
},
'markdown' => function (App $kirby, string $text = null, array $options = []): string {