Merge branch 'MDL-76041-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE

This commit is contained in:
Jake Dallimore
2022-10-31 11:44:09 +08:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ class get_recordings extends external_api {
if ($groupid) {
$instance->set_group_id($groupid);
}
$recordings = $instance->get_recordings([], $instance->get_instance_var('recordings_deleted'));
$recordings = $instance->get_recordings([], $instance->get_instance_var('recordings_deleted') ?? false);
$tabledata = recording_data::get_recording_table($recordings, $tools, $instance);
$returnval['tabledata'] = $tabledata;
+2 -2
View File
@@ -406,7 +406,7 @@ EOF;
* Helper to get an instance var.
*
* @param string $name
* @return string
* @return mixed|null
*/
public function get_instance_var(string $name) {
$instance = $this->get_instance_data();
@@ -1118,7 +1118,7 @@ EOF;
* @param bool $viewdeleted view deleted recordings ?
* @return recording[]
*/
public function get_recordings(array $excludedid = [], $viewdeleted = false): array {
public function get_recordings(array $excludedid = [], bool $viewdeleted = false): array {
// Fetch the list of recordings depending on the status of the instance.
// show room is enabled for TYPE_ALL and TYPE_ROOM_ONLY.
if ($this->is_feature_enabled('showroom')) {