Merge pull-request #738

This commit is contained in:
Frederic Guillot 2015-03-30 20:47:42 -04:00
commit 147f2015c0
3 changed files with 6 additions and 1 deletions

View File

@ -502,7 +502,7 @@ class Helper
public function markdown($text, array $link = array())
{
$parser = new Markdown($link, $this);
$parser->setMarkupEscaped(true);
$parser->setMarkupEscaped(MARKDOWN_ESCAPED);
return $parser->text($text);
}

View File

@ -74,3 +74,5 @@ defined('ENABLE_XFRAME') or define('ENABLE_XFRAME', true);
// Default files directory
defined('FILES_DIR') or define('FILES_DIR', 'data/files/');
// Escape html inside markdown text
define('MARKDOWN_ESCAPED', true);

View File

@ -127,3 +127,6 @@ define('ENABLE_HSTS', true);
// Enable or disable "X-Frame-Options: DENY" HTTP header
define('ENABLE_XFRAME', true);
// Escape html inside markdown text
define('MARKDOWN_ESCAPED', true);