From 9a04118fcd53b75390df088c78d4828275988e56 Mon Sep 17 00:00:00 2001
From: Semyon Novikov <me@sdfgh153.ru>
Date: Wed, 25 Mar 2015 08:35:07 +0500
Subject: Add option for toggling html escapes inside markdown fields

---
 app/Core/Helper.php | 2 +-
 config.default.php  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Core/Helper.php b/app/Core/Helper.php
index 34a5e6ab..883e457e 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(true);
+        $parser->setMarkupEscaped(MARKDOWN_ESCAPED);        
         return $parser->text($text);
     }
 
diff --git a/config.default.php b/config.default.php
index eb9ad1b8..8976a385 100644
--- a/config.default.php
+++ b/config.default.php
@@ -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', false);
-- 
cgit v1.2.3


From 93c286ce8791db610784c8177e3ba0653b1b6082 Mon Sep 17 00:00:00 2001
From: Semyon Novikov <me@sdfgh153.ru>
Date: Wed, 25 Mar 2015 08:38:56 +0500
Subject: Set default value fro MARKDOWN_ESCAPED

---
 config.default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.default.php b/config.default.php
index 8976a385..0306ea35 100644
--- a/config.default.php
+++ b/config.default.php
@@ -129,4 +129,4 @@ define('ENABLE_HSTS', true);
 define('ENABLE_XFRAME', true);
 
 // Escape html inside markdown text
-define('MARKDOWN_ESCAPED', false);
+define('MARKDOWN_ESCAPED', true);
-- 
cgit v1.2.3


From 2db1af88bbc2c9d72765577fd09ac588c5e67ebf Mon Sep 17 00:00:00 2001
From: Semyon Novikov <me@sdfgh153.ru>
Date: Wed, 25 Mar 2015 10:08:50 +0500
Subject: Missing default value for MARKDOWN_ESCAPED constant

Also removed stray trailing whitespace in Helper.php
---
 app/Core/Helper.php | 2 +-
 app/constants.php   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Core/Helper.php b/app/Core/Helper.php
index 883e457e..1dea832a 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_ESCAPED);
         return $parser->text($text);
     }
 
diff --git a/app/constants.php b/app/constants.php
index 82d26f2c..8c23da81 100644
--- a/app/constants.php
+++ b/app/constants.php
@@ -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);
-- 
cgit v1.2.3