diff --git a/Changes.md b/Changes.md index 465ba863..fd3037a8 100644 --- a/Changes.md +++ b/Changes.md @@ -3,6 +3,7 @@ History Version 401.2.5.5 - 28/09/2024 ------------------------------ +1. Fix 'Version 404.1.2 adhoc task fails' - #222. Version 401.2.5 - 23/09/2024 ---------------------------- diff --git a/classes/task/update_displayed_images_task.php b/classes/task/update_displayed_images_task.php index 2fcb4e2b..34241031 100644 --- a/classes/task/update_displayed_images_task.php +++ b/classes/task/update_displayed_images_task.php @@ -47,7 +47,8 @@ public static function update_displayed_images_imageresizemethod() { $gridcourses = $DB->get_records('course', ['format' => 'grid'], '', 'id'); foreach ($gridcourses as $gridcourse) { - $format = course_get_format($gridcourse->id); + // Instead of course_get_format() for CLI usage. + $format = \core_courseformat\base::instance($gridcourse->id); $imageresizemethod = $format->get_format_options()['imageresizemethod']; if ($imageresizemethod != 0) { $task = new update_displayed_images_adhoc(); diff --git a/classes/toolbox.php b/classes/toolbox.php index 2b43eb11..df7365a5 100644 --- a/classes/toolbox.php +++ b/classes/toolbox.php @@ -698,7 +698,8 @@ private static function update_the_displayed_images($courseid = null) { foreach ($coursesectionimages as $coursesectionimage) { if ($courseid != $coursesectionimage->courseid) { $courseid = $coursesectionimage->courseid; - $format = course_get_format($courseid); + // Instead of course_get_format() for CLI usage. + $format = \core_courseformat\base::instance($courseid); if (get_class($format) != 'format_grid') { // Not currently in the Grid format, but was. $format = null; diff --git a/db/upgrade.php b/db/upgrade.php index ae6defce..a83f0e53 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -190,17 +190,17 @@ function xmldb_format_grid_upgrade($oldversion = 0) { upgrade_plugin_savepoint(true, 2022112605, 'format', 'grid'); } - if ($oldversion < 2022112610) { + if ($oldversion < 2022112612) { // Has the upgrade already happened? Thus in versions for Moodle 4.1+ ? $codebase = get_config('format_grid', 'codebase'); - if ((empty($codebase)) || ((!empty($codebase)) && ($codebase < 2024090700))) { + if ((empty($codebase)) || ((!empty($codebase)) && ($codebase < 2024092900))) { // No! \format_grid\task\update_displayed_images_task::update_displayed_images_imageresizemethod(); - set_config('codebase', 2024090700, 'format_grid'); + set_config('codebase', 2024092900, 'format_grid'); } // Grid savepoint reached. - upgrade_plugin_savepoint(true, 2022112610, 'format', 'grid'); + upgrade_plugin_savepoint(true, 2022112612, 'format', 'grid'); } // Automatic 'Purge all caches'....