Merge pull request #761 from vichan-devel/parsedown

Parsedown

composer.json

@@ -18,7 +18,8 @@
         "gettext/gettext": "^5.5",
         "mrclay/minify": "^2.1.6",
         "geoip/geoip": "^1.17",
-        "dapphp/securimage": "^4.0"
+        "dapphp/securimage": "^4.0",
+        "erusev/parsedown":  "^1.7.4"
     },
     "autoload": {
         "classmap": ["inc/"],

inc/functions.php

@@ -2820,7 +2820,6 @@ function purify_html($s) {
 function markdown($s) {
 	$pd = new Parsedown();
 	$pd->setMarkupEscaped(true);
-	$pd->setimagesEnabled(false);
 
 	return $pd->text($s);
 }

templates/mod/dashboard.html

@@ -166,7 +166,7 @@
 			<li>
 				A newer version of vichan
 				(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available!
-				See <a href="https://engine.vichan.net">https://engine.vichan.net/</a> for upgrade instructions.
+				See <a href="https://vichan.info">https://vichan.info/</a> for upgrade instructions.
 			</li>
 		</ul>
 	</fieldset>

templates/mod/edit_page.html

@@ -5,7 +5,7 @@
 		<tr>
 		<th>{% trans %}Markup method{% endtrans %}
 			{% set allowed_html = config.allowed_html %}
-			{% trans %}<p class="unimportant">"markdown" is provided by <a href="http://parsedown.org/">parsedown</a>. Note: images disabled.</p>
+			{% trans %}<p class="unimportant">"markdown" is provided by <a href="http://parsedown.org/">parsedown</a></p>
 			<p class="unimportant">"html" allows the following tags:<br/>{{ allowed_html }}</p>
 			<p class="unimportant">"infinity" is the same as what is used in posts.</p>
 			<p class="unimportant">This page will not convert between formats,<br/>choose it once or do the conversion yourself!</p>{% endtrans %}