SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

fix(Pico): call to new parsedown

Browse Source
This commit is contained in:
Jérémy Dufraisse 2023-02-27 09:06:39 +01:00
parent 107cb3fafe
commit fca0c92b60
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Pico.php
View File

@ -43,7 +43,9 @@
* @version 3.0 * @version 3.0
*/ */
use Erusev\Parsedown\Configurables\Breaks;
use Erusev\Parsedown\Parsedown; use Erusev\Parsedown\Parsedown;
use Erusev\Parsedown\State;
use Erusev\ParsedownExtra\ParsedownExtra; use Erusev\ParsedownExtra\ParsedownExtra;
class Pico class Pico
@ -1565,12 +1567,13 @@ class Pico
public function getParsedown() public function getParsedown()
{ {
if ($this->parsedown === null) { if ($this->parsedown === null) {
$className = $this->config['content_config']['extra'] ? ParsedownExtra::class : Parsedown::class; $state = new State([
$this->parsedown = new $className(); new Breaks((bool) $this->config['content_config']['breaks'])
]);
$this->parsedown->setBreaksEnabled((bool) $this->config['content_config']['breaks']); if ($this->config['content_config']['extra']){
$this->parsedown->setMarkupEscaped((bool) $this->config['content_config']['escape']); $state = new ParsedownExtra($state);
$this->parsedown->setUrlsLinked((bool) $this->config['content_config']['auto_urls']); }
$this->parsedown = new Parsedown($state);
$this->triggerEvent('onParsedownRegistered', array(&$this->parsedown)); $this->triggerEvent('onParsedownRegistered', array(&$this->parsedown));
} }
@ -1670,14 +1673,13 @@ class Pico
* @see Pico::getFileContent() * @see Pico::getFileContent()
* *
* @param string $markdown Markdown contents of a page * @param string $markdown Markdown contents of a page
* @param bool $singleLine whether to parse just a single line of markup
* *
* @return string parsed contents (HTML) * @return string parsed contents (HTML)
*/ */
public function parseFileContent($markdown, $singleLine = false) public function parseFileContent($markdown)
{ {
$markdownParser = $this->getParsedown(); $markdownParser = $this->getParsedown();
return !$singleLine ? @$markdownParser->text($markdown) : @$markdownParser->line($markdown); return @$markdownParser->toHtml($markdown);
} }
/** /**