Merge pull request etoa#212 from etoa/t/markdown

Markdown: use library instead of class in code
A-A-G · Apr 13, 2020 · 711b0ea · 711b0ea
2 parents efa1028 + 66fa101
commit 711b0ea
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 1,434 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,8 @@
         "symfony/stopwatch": "~4.2.12",
         "symfony/http-kernel": "~4.2.12",
         "symfony/http-foundation": "~4.2.12",
-        "twig/twig": "^2.12"
+        "twig/twig": "^2.12",
+        "league/commonmark": "^1.3"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/htdocs/admin/content/overview.php b/htdocs/admin/content/overview.php
@@ -91,12 +91,11 @@
 	// Changelog
 	//
 	elseif ($sub === "changelog") {
-		$Parsedown = new Parsedown();
 		$changelogFile = "../../Changelog.md";
 		$changelogPublicFile = "../../Changelog_public.md";
         echo $twig->render('admin/overview/changelog.html.twig', [
-            'changelog' => is_file($changelogFile) ? $Parsedown->text(file_get_contents($changelogFile)) : null,
-            'changelogPublic' => is_file($changelogPublicFile) ? $Parsedown->text(file_get_contents($changelogPublicFile)) : null,
+            'changelog' => is_file($changelogFile) ? $app['etoa.util.markdown']->convertToHtml(file_get_contents($changelogFile)) : null,
+            'changelogPublic' => is_file($changelogPublicFile) ? $app['etoa.util.markdown']->convertToHtml(file_get_contents($changelogPublicFile)) : null,
         ]);
         exit();
 	}