mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-06 06:07:31 +02:00
Code Issues Releases Wiki Activity

V.2.6.0 Improve markdown extension to process shortcodes inside theme markdown input

Browse Source
This commit is contained in:
trendschau
2024-06-07 06:45:32 +02:00
parent 24ac765706
commit 93544d1f29
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
system/typemill/Extensions/TwigMarkdownExtension.php
View File

@@ -8,6 +8,21 @@ use Typemill\Extensions\ParsedownExtension;
class TwigMarkdownExtension extends AbstractExtension
{
protected $dispatcher;
protected $settings;
protected $baseurl;
public function __construct($baseurl, $settings, $dispatcher)
{
$this->dispatcher = $dispatcher;
$this->settings = $settings;
$this->baseurl = $baseurl;
}
public function getFunctions()
{
return [
@@ -17,8 +32,8 @@ class TwigMarkdownExtension extends AbstractExtension
public function renderMarkdown($markdown)
{
$parsedown = new ParsedownExtension();
$parsedown = new ParsedownExtension($this->baseurl, $this->settings, $this->dispatcher);
$markdownArray = $parsedown->text($markdown);
return $parsedown->markup($markdownArray);

5
system/typemill/system.php
View File

@@ -73,7 +73,6 @@ if(isset($settings['displayErrorDetails']) && $settings['displayErrorDetails'])
ini_set('display_errors', $display_errors);
}
/****************************
* CREATE CONTAINER + APP *
****************************/
@@ -299,7 +298,7 @@ $container->set('assets', function() use ($assets){ return $assets; });
* TWIG TO CONTAINER *
****************************/
$container->set('view', function() use ($settings, $urlinfo, $translations) {
$container->set('view', function() use ($settings, $urlinfo, $translations, $dispatcher) {
$twig = Twig::create(
[
@@ -325,7 +324,7 @@ $container->set('view', function() use ($settings, $urlinfo, $translations) {
$twig->addExtension(new TwigUserExtension());
$twig->addExtension(new TwigUrlExtension($urlinfo));
$twig->addExtension(new TwigLanguageExtension( $translations ));
$twig->addExtension(new TwigMarkdownExtension());
$twig->addExtension(new TwigMarkdownExtension($urlinfo['baseurl'], $settings, $dispatcher));
$twig->addExtension(new TwigMetaExtension());
$twig->addExtension(new TwigPagelistExtension());
$twig->addExtension(new TwigCaptchaExtension());

4
themes/cyanine/layout.twig
View File

@@ -177,8 +177,6 @@
{% endif %}
</style>
{{ assets.renderCSS() }}
{% endblock %}
</head>
@@ -246,6 +244,8 @@
</script>
{% endif %}
{{ assets.renderCSS() }}
{{ assets.renderJS() }}
{% endblock %}