diff --git a/Parsedown.php b/Parsedown.php index 0695c6f..0dbf40c 100644 --- a/Parsedown.php +++ b/Parsedown.php @@ -75,14 +75,14 @@ class Parsedown protected $urlsLinked = true; - function setSafeLinksEnabled($safeLinksEnabled) + function setSafeMode($safeMode) { - $this->safeLinksEnabled = $safeLinksEnabled; + $this->safeMode = (bool) $safeMode; return $this; } - protected $safeLinksEnabled = true; + protected $safeMode; protected $safeLinksWhitelist = array( 'http://', @@ -378,7 +378,7 @@ class Parsedown protected function blockComment($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } @@ -700,7 +700,7 @@ class Parsedown protected function blockMarkup($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } @@ -1282,7 +1282,7 @@ class Parsedown protected function inlineMarkup($Excerpt) { - if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false) + if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false) { return; } @@ -1543,7 +1543,7 @@ class Parsedown protected function filterUnsafeUrlInAttribute(array $Element, $attribute) { - if ($this->safeLinksEnabled) + if ($this->safeMode) { foreach ($this->safeLinksWhitelist as $scheme) { diff --git a/test/ParsedownTest.php b/test/ParsedownTest.php index 5fbf7f1..c7e3a82 100644 --- a/test/ParsedownTest.php +++ b/test/ParsedownTest.php @@ -46,7 +46,7 @@ class ParsedownTest extends PHPUnit_Framework_TestCase $expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup); $expectedMarkup = str_replace("\r", "\n", $expectedMarkup); - $this->Parsedown->setMarkupEscaped($test === 'xss_text_encoding'); + $this->Parsedown->setSafeMode(substr($test, 0, 3) === 'xss'); $actualMarkup = $this->Parsedown->text($markdown); diff --git a/test/data/inline_link.html b/test/data/inline_link.html index 7a3131b..cef29cf 100644 --- a/test/data/inline_link.html +++ b/test/data/inline_link.html @@ -1,5 +1,5 @@

link

-

link with parentheses in URL

+

link with parentheses in URL

(link) in parentheses

link

MD Logo