Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 19:27:23 +02:00
Code Issues Packages Projects Releases Activity

Fixed twig parsing errors in pages where twig is parsed after markdown [#3162]

Browse Source
This commit is contained in:
Matias Griese
2021-01-20 15:36:48 +02:00
parent 440fa263c2
commit a0c3140e6d
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -8,6 +8,7 @@
* Fixed `bin/gpm selfupgrade` failing to report failed Grav update [#3116](https://github.com/getgrav/grav/issues/3116)
* Fixed `bin/gpm selfupgrade` error on `Call to undefined method` [#3160](https://github.com/getgrav/grav/issues/3160)
* Flex Pages: Fixed fatal error when trying to move a page to Root (/) [#3161](https://github.com/getgrav/grav/issues/3161)
* Fixed twig parsing errors in pages where twig is parsed after markdown [#3162](https://github.com/getgrav/grav/issues/3162)
# v1.7.0
## 01/19/2021

27
system/src/Grav/Common/Page/Page.php
View File

@@ -783,7 +783,7 @@ class Page implements PageInterface
Grav::instance()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
} else {
if ($process_markdown) {
$this->processMarkdown();
$this->processMarkdown($process_twig);
}
// Content Processed but not cached yet
@@ -871,9 +871,10 @@ class Page implements PageInterface
/**
* Process the Markdown content. Uses Parsedown or Parsedown Extra depending on configuration
*
* @param bool $keepTwig If true, content between twig tags will not be processed.
* @return void
*/
protected function processMarkdown()
protected function processMarkdown(bool $keepTwig = false)
{
/** @var Config $config */
$config = Grav::instance()['config'];
@@ -905,7 +906,27 @@ class Page implements PageInterface
$parsedown = new Parsedown($excerpts);
}
$this->content = $parsedown->text($this->content);
$content = $this->content;
if ($keepTwig) {
// Base64 encode any twig.
$content = preg_replace_callback(
['/({#)(.*?)(#})/mu', '/({{)(.*?)(}})/mu', '/({%)(.*?)(%})/mu'],
static function ($matches) { return $matches[1] . base64_encode($matches[2]) . $matches[3]; },
$content
);
}
$content = $parsedown->text($content);
if ($keepTwig) {
// Base64 decode the encoded twig.
$content = preg_replace_callback(
['/({#)(.*?)(#})/mu', '/({{)(.*?)(}})/mu', '/({%)(.*?)(%})/mu'],
static function ($matches) { return $matches[1] . base64_decode($matches[2]) . $matches[3]; },
$content
);
}
$this->content = $content;
}

24
system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php
View File

@@ -734,6 +734,7 @@ trait PageContentTrait
$grav->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
} else {
if ($process_markdown) {
$options['keep_twig'] = $process_twig;
$this->_content = $this->processMarkdown($this->_content, $options);
}
@@ -807,7 +808,28 @@ trait PageContentTrait
$parsedown = new Parsedown($excerpts);
}
return $parsedown->text($content);
$keepTwig = (bool)($options['keep_twig'] ?? false);
if ($keepTwig) {
// Base64 encode any twig.
$content = preg_replace_callback(
['/({#)(.*?)(#})/mu', '/({{)(.*?)(}})/mu', '/({%)(.*?)(%})/mu'],
static function ($matches) { return $matches[1] . base64_encode($matches[2]) . $matches[3]; },
$content
);
}
$content = $parsedown->text($content);
if ($keepTwig) {
// Base64 decode the encoded twig.
$content = preg_replace_callback(
['/({#)(.*?)(#})/mu', '/({{)(.*?)(}})/mu', '/({%)(.*?)(%})/mu'],
static function ($matches) { return $matches[1] . base64_decode($matches[2]) . $matches[3]; },
$content
);
}
return $content;
}
abstract protected function loadHeaderProperty(string $property, $var, callable $filter);