From c22af12f0377dbd29bebc421cb5c4cd8f48be73a Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sat, 19 Oct 2019 10:51:25 +0200 Subject: [PATCH] MDL-66964 markdown: add details to readme The commit to apply, from upstream repo, is: https://github.com/michelf/php-markdown/commit/a35858f0409e5f01474f5cd562d17289fe8e5435 But it doesn't apply clean to our current 1.8.0 version. So we have ended a slightly different version in core reproducing the same changes. --- lib/markdown/readme_moodle.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/markdown/readme_moodle.txt b/lib/markdown/readme_moodle.txt index 21f24954d19..c8016b082be 100644 --- a/lib/markdown/readme_moodle.txt +++ b/lib/markdown/readme_moodle.txt @@ -5,13 +5,15 @@ Procedure: * copy the classes and readme file to lib/markdown/* , Note .inc files need not be copied. * update function markdown_to_html() in weblib.php if necessary, note that we require the php files manually for performance reasons -* pull commits https://github.com/michelf/php-markdown/commit/0c1337a4d483b1e0b66bfdc3ffa644eafd40aa27 - and https://github.com/michelf/php-markdown/commit/251ffcce7582d4b26936679e340abca973d55220 - if they are not included in the next release (or remove this step) -* run phpunit tests +* reapply the following commit if it's not present in the release we are upgrading to: + https://github.com/michelf/php-markdown/commit/a35858f0409e5f01474f5cd562d17289fe8e5435 + (if there is any problem you can, alternatively, reapply MDL-66964 php fix commit itself)) + (revove this step once the release includes the commit) + +* run phpunit tests (all PHP versions) Petr Skoda -* Referenced commits are now in the 1.8.0 release. +* Currently using the 1.8.0 release + (php74 fixup commit) Mathew May