1
0
mirror of https://github.com/erusev/parsedown.git synced 2023-08-10 21:13:06 +03:00

Compare commits

..

5 Commits

Author SHA1 Message Date
1f69f7e697 Bump version 2018-05-08 22:46:15 +01:00
c83af0a7d5 Merge pull request #628 from aidantwoods/fix/revert-rawHtml-breaks-insertion
Preserve plain-text in AST to avoid blinding extensions to it
2018-05-08 22:41:44 +01:00
4686daf8c2 Preserve plain-text in AST to avoid blinding extensions to it 2018-05-08 22:32:57 +01:00
c9e7183cfa Merge pull request #627 from aidantwoods/fix/hidden-blocks
Intepret special "hidden" key as an empty element
2018-05-08 22:07:51 +01:00
9eed1104e7 Intepret special "hidden" key as an empty element 2018-05-08 21:54:30 +01:00

View File

@ -17,7 +17,7 @@ class Parsedown
{ {
# ~ # ~
const version = '1.8.0-beta-3'; const version = '1.8.0-beta-4';
# ~ # ~
@ -317,10 +317,17 @@ class Parsedown
protected function extractElement(array $Component) protected function extractElement(array $Component)
{ {
if ( ! isset($Component['element']) and isset($Component['markup'])) if ( ! isset($Component['element']))
{
if (isset($Component['markup']))
{ {
$Component['element'] = array('rawHtml' => $Component['markup']); $Component['element'] = array('rawHtml' => $Component['markup']);
} }
elseif (isset($Component['hidden']))
{
$Component['element'] = array();
}
}
return $Component['element']; return $Component['element'];
} }
@ -1208,14 +1215,14 @@ class Parsedown
'element' => array(), 'element' => array(),
); );
$safeText = self::escape($text, true); $Inline['element']['elements'] = self::pregReplaceElements(
$Inline['element']['rawHtml'] = preg_replace(
$this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/', $this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/',
"<br />\n", array(
$safeText array('name' => 'br'),
array('text' => "\n"),
),
$text
); );
$Inline['element']['allowRawHtmlInSafeMode'] = true;
return $Inline; return $Inline;
} }