Merge branch 'develop' into 'master'

Version 1.1.2 See merge request framasoft/framadate!295
2018-04-11 18:08:01 +02:00 · 2018-04-11 18:08:01 +02:00 · 53572dbc1f
commit 53572dbc1f
parent 9829c826ef b2fc3a9d53
1 changed files with 2 additions and 2 deletions
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@ -146,9 +146,9 @@ class Utils {
        $parseDown = new Parsedown();

        $parseDown
-            ->setMarkupEscaped(true)
            ->setBreaksEnabled(true)
-            ->setUrlsLinked(false);
+            ->setSafeMode(true)
+            ;

        if ($line) {
            $html  = $parseDown->line($md);