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

Upgrade to 3.1.0

Browse Source
This commit is contained in:
Bastian Allgeier
2019-03-19 11:07:14 +01:00
parent 418db4b09b
commit 6e074142f1
98 changed files with 1266 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kirby/config/components.php
View File

@@ -9,6 +9,7 @@ use Kirby\Cms\Template;
use Kirby\Data\Data;
use Kirby\Exception\NotFoundException;
use Kirby\Image\Darkroom;
use Kirby\Text\Markdown;
use Kirby\Text\SmartyPants;
use Kirby\Toolkit\F;
use Kirby\Toolkit\Tpl as Snippet;
@@ -50,17 +51,12 @@ return [
'file::url' => function (App $kirby, $file) {
return $file->mediaUrl();
},
'markdown' => function (App $kirby, string $text = null, array $options = []): string {
'markdown' => function (App $kirby, string $text = null, array $options = [], bool $inline = false): string {
static $markdown;
if (isset($markdown) === false) {
$parser = ($options['extra'] ?? false) === true ? 'ParsedownExtra' : 'Parsedown';
$markdown = new $parser;
$markdown->setBreaksEnabled($options['breaks'] ?? true);
}
$markdown = $markdown ?? new Markdown($options);
// we need the @ here, because parsedown has some notice issues :(
return @$markdown->text($text);
return $markdown->parse($text, $inline);
},
'smartypants' => function (App $kirby, string $text = null, array $options = []): string {
static $smartypants;