From f38b21ef5a7e5f36142f044cc8456ea46a35f9c8 Mon Sep 17 00:00:00 2001 From: Peter Dias Date: Wed, 13 Jan 2021 10:34:04 +0800 Subject: [PATCH] MDL-70296 core: Update the moodle's readme, xml and upgrade files --- lib/markdown/readme_moodle.txt | 10 +++------- lib/thirdpartylibs.xml | 4 ++-- lib/upgrade.txt | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/markdown/readme_moodle.txt b/lib/markdown/readme_moodle.txt index c8016b082be..befa87681e9 100644 --- a/lib/markdown/readme_moodle.txt +++ b/lib/markdown/readme_moodle.txt @@ -5,15 +5,11 @@ 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 -* 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 -* Currently using the 1.8.0 release + (php74 fixup commit) +* Removed fixup step in procedure +* Currently using the 1.9.0 release(includes php74 fixup commit) -Mathew May +Peter Dias diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml index 768a7af3d57..b9aa552dda2 100644 --- a/lib/thirdpartylibs.xml +++ b/lib/thirdpartylibs.xml @@ -163,9 +163,9 @@ markdown - Markdown original+extra + Markdown original BSD - 1.8.0 + 1.9.0 diff --git a/lib/upgrade.txt b/lib/upgrade.txt index 499aedabe96..5810ef0f718 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -15,6 +15,7 @@ information provided here is intended especially for developers. * Behat timeout constants behat_base::TIMEOUT, EXTENDED_TIMEOUT, and REDUCED_TIMEOUT, which were deprecated in 3.7, have been removed. * \core_table\local\filter\filterset::JOINTYPE_DEFAULT is being changed from 1 (ANY) to 2 (ALL). Filterset implementations can override the default filterset join type by overriding \core_table\local\filter\filterset::get_join_type() instead. +* Markdown lib has been upgraded to the latest version - 1.9.0 === 3.10 === * PHPUnit has been upgraded to 8.5. That comes with a few changes: