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

26
kirby/src/Cms/Media.php
View File

@@ -25,22 +25,34 @@ class Media
* @param string $filename
* @return Response|false
*/
public static function thumb(Model $model, string $hash, string $filename)
public static function thumb($model, string $hash, string $filename)
{
$kirby = App::instance();
if (is_string($model) === true) {
// assets
$root = $kirby->root('media') . '/assets/' . $model . '/' . $hash;
} else {
// model files
$root = $model->mediaRoot() . '/' . $hash;
}
try {
$kirby = $model->kirby();
$url = $model->mediaUrl() . '/' . $hash . '/' . $filename;
$root = $model->mediaRoot() . '/' . $hash;
$thumb = $root . '/' . $filename;
$job = $root . '/.jobs/' . $filename . '.json';
$options = Data::read($job);
$file = $model->file($options['filename']);
if (!$file || empty($options) === true) {
if (empty($options) === true) {
return false;
}
$kirby->thumb($file->root(), $thumb, $options);
if (is_string($model) === true) {
$source = $kirby->root('index') . '/' . $model . '/' . $options['filename'];
} else {
$source = $model->file($options['filename'])->root();
}
$kirby->thumb($source, $thumb, $options);
F::remove($job);