Skip to content

Commit e0907a8

Browse files
committed
Merge branch 'MOODLE_500_STABLE'
2 parents 29f04a7 + 39f82c3 commit e0907a8

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
5.0.4 (2025-11-07)
5+
------------------
6+
* [FIXED] Gracefully handle exception in the setting when the tool plugin is not ready yet
7+
8+
49
5.0.3 (2025-11-07)
510
------------------
611
* [FIXED] Make sure no real api instance is requested and process also during phpunit init

classes/settings/upload_settings_helper.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,15 @@ private static function add_processing_tab_settings(mod_opencast_admin_settingsp
249249
self::add_heading($settings, $tabname, $ocinstanceid);
250250

251251
$disabled = false;
252-
if (!(defined('BEHAT_UTIL') && BEHAT_UTIL) && !(defined('PHPUNIT_UTIL') && PHPUNIT_UTIL)) {
253-
$wfconfighelper = workflowconfiguration_helper::get_instance($ocinstanceid);
254-
if (!$wfconfighelper->can_provide_configuration_panel()) {
255-
$disabled = true;
252+
if (!(defined('BEHAT_UTIL') && BEHAT_UTIL) && !(defined('PHPUNIT_UTIL') && PHPUNIT_UTIL) && !during_initial_install()) {
253+
try {
254+
$wfconfighelper = workflowconfiguration_helper::get_instance($ocinstanceid);
255+
if (!$wfconfighelper->can_provide_configuration_panel()) {
256+
$disabled = true;
257+
}
258+
} catch (\Throwable $e) {
259+
// We want this to NOT throw error at this point, when it does we just disable the feature.
260+
$disabled = false;
256261
}
257262
}
258263

version.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
defined('MOODLE_INTERNAL') || die();
2727

2828
$plugin->component = 'mod_opencast';
29-
$plugin->release = 'v5.0-r4';
30-
$plugin->version = 2025080103;
29+
$plugin->release = 'v5.0-r5';
30+
$plugin->version = 2025080104;
3131
$plugin->requires = 2025041400; // Requires Moodle 5.0+.
3232
$plugin->supported = [500, 500];
3333
$plugin->maturity = MATURITY_STABLE;

0 commit comments

Comments
 (0)