jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix several rendering issues in markdown (#3588)

Browse Source 
- fix double escaping of html entities: " instead of "
- fix table is missing css class "table"
- fix quotes are not rendered
This commit is contained in:
Kevin Papst
2022-10-19 21:17:49 +02:00
committed by GitHub
parent 6d7054c18c
commit 73ef090b9e
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Twig/Runtime/MarkdownExtension.php
View File

@@ -63,7 +63,7 @@ final class MarkdownExtension implements RuntimeExtensionInterface
if ($this->isMarkdownEnabled()) {
$content = $this->markdown->toHtml($content);
} elseif ($fullLength) {
$content = '<p>' . nl2br($content) . '</p>';
$content = '<p>' . nl2br(htmlspecialchars($content)) . '</p>';
}
return $content;
@@ -115,7 +115,7 @@ final class MarkdownExtension implements RuntimeExtensionInterface
return $this->markdown->toHtml($content);
}
return nl2br($content);
return nl2br(htmlspecialchars($content));
}
/**

4
src/Twig/RuntimeExtensions.php
View File

@@ -45,8 +45,8 @@ class RuntimeExtensions extends AbstractExtension
{
return [
new TwigFilter('md2html', [MarkdownExtension::class, 'markdownToHtml'], ['pre_escape' => 'html', 'is_safe' => ['html']]),
new TwigFilter('desc2html', [MarkdownExtension::class, 'timesheetContent'], ['pre_escape' => 'html', 'is_safe' => ['html']]),
new TwigFilter('comment2html', [MarkdownExtension::class, 'commentContent'], ['pre_escape' => 'html', 'is_safe' => ['html']]),
new TwigFilter('desc2html', [MarkdownExtension::class, 'timesheetContent'], ['is_safe' => ['html']]),
new TwigFilter('comment2html', [MarkdownExtension::class, 'commentContent'], ['is_safe' => ['html']]),
new TwigFilter('comment1line', [MarkdownExtension::class, 'commentOneLiner'], ['pre_escape' => 'html', 'is_safe' => ['html']]),
new TwigFilter('colorize', [ThemeExtension::class, 'colorize']),
];