summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-03-30 20:52:30 -0400
committerFrederic Guillot <fred@kanboard.net>2015-03-30 20:52:30 -0400
commitb17f4b28ca948d223f12ceab96e38c018f32c6fd (patch)
tree9fab1d2a3ffaa4c392a5cd8ade4eb85be769ae2a
parent147f2015c0d1adeb6e248bcdd023fe67fc81154a (diff)
Improve pull-request #738
-rw-r--r--app/Core/Helper.php2
-rw-r--r--app/constants.php2
-rw-r--r--config.default.php4
3 files changed, 5 insertions, 3 deletions
diff --git a/app/Core/Helper.php b/app/Core/Helper.php
index 1dea832a..013bf0f2 100644
--- a/app/Core/Helper.php
+++ b/app/Core/Helper.php
@@ -502,7 +502,7 @@ class Helper
public function markdown($text, array $link = array())
{
$parser = new Markdown($link, $this);
- $parser->setMarkupEscaped(MARKDOWN_ESCAPED);
+ $parser->setMarkupEscaped(MARKDOWN_ESCAPE_HTML);
return $parser->text($text);
}
diff --git a/app/constants.php b/app/constants.php
index 8c23da81..08759cbd 100644
--- a/app/constants.php
+++ b/app/constants.php
@@ -75,4 +75,4 @@ defined('ENABLE_XFRAME') or define('ENABLE_XFRAME', true);
defined('FILES_DIR') or define('FILES_DIR', 'data/files/');
// Escape html inside markdown text
-define('MARKDOWN_ESCAPED', true);
+defined('MARKDOWN_ESCAPE_HTML') or define('MARKDOWN_ESCAPE_HTML', true);
diff --git a/config.default.php b/config.default.php
index 0306ea35..92b61bde 100644
--- a/config.default.php
+++ b/config.default.php
@@ -1,5 +1,7 @@
<?php
+// Rename this file to config.php if you want to change the values
+
// Enable/Disable debug
define('DEBUG', false);
@@ -129,4 +131,4 @@ define('ENABLE_HSTS', true);
define('ENABLE_XFRAME', true);
// Escape html inside markdown text
-define('MARKDOWN_ESCAPED', true);
+define('MARKDOWN_ESCAPE_HTML', true);