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

Upgrade to 3.1.2

Browse Source
This commit is contained in:
Bastian Allgeier
2019-04-09 14:34:12 +02:00
parent 852a14595e
commit eb29ef6d6c
58 changed files with 535 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
kirby/config/helpers.php
View File

@@ -105,16 +105,13 @@ function css($url, $options = null)
$kirby = App::instance();
if ($component = $kirby->component('css')) {
$url = $component($kirby, $url, $options);
}
if ($url === '@auto') {
if (!$url = Url::toTemplateAsset('css/templates', 'css')) {
return null;
}
}
$url = $kirby->component('css')($kirby, $url, $options);
$url = Url::to($url);
$attr = array_merge((array)$options, [
'href' => $url,
@@ -264,10 +261,20 @@ function image(string $path = null)
$uri = null;
}
$page = $uri === '/' ? site() : page($uri);
switch ($uri) {
case '/':
$parent = site();
break;
case null:
$parent = page();
break;
default:
$parent = page($uri);
break;
}
if ($page) {
return $page->image($filename);
if ($parent) {
return $parent->image($filename);
} else {
return null;
}
@@ -359,16 +366,13 @@ function js($url, $options = null)
$kirby = App::instance();
if ($component = $kirby->component('js')) {
$url = $component($kirby, $url, $options);
}
if ($url === '@auto') {
if (!$url = Url::toTemplateAsset('js/templates', 'js')) {
return null;
}
}
$url = $kirby->component('js')($kirby, $url, $options);
$url = Url::to($url);
$attr = array_merge((array)$options, ['src' => $url]);
@@ -711,12 +715,7 @@ function svg(string $file)
}
}
ob_start();
include $file;
$svg = ob_get_contents();
ob_end_clean();
return $svg;
return F::read($file);
}
/**