From 390326fd1772b0c177cd147b0aa489f09c0e44ce Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 4 Jan 2021 14:37:46 +0000 Subject: [PATCH] MDL-70535 media_videojs: fallback to English language video player. When current language doesn't have accompanying videojs language file we should fallback to displaying the player in English, otherwise the web service returns empty and a Javascript exception is triggered. --- media/player/videojs/classes/external/get_language.php | 6 +++++- media/player/videojs/classes/plugin.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/media/player/videojs/classes/external/get_language.php b/media/player/videojs/classes/external/get_language.php index 9e32bab314f..355be4ee89f 100644 --- a/media/player/videojs/classes/external/get_language.php +++ b/media/player/videojs/classes/external/get_language.php @@ -57,7 +57,11 @@ class get_language extends external_api { * @return string */ public static function execute(string $lang) { - external_api::validate_parameters(self::execute_parameters(), ['lang' => $lang]); + [ + 'lang' => $lang, + ] = external_api::validate_parameters(self::execute_parameters(), [ + 'lang' => $lang, + ]); return \media_videojs_plugin::get_language_content($lang); } diff --git a/media/player/videojs/classes/plugin.php b/media/player/videojs/classes/plugin.php index 7ca33e3fc03..1eb79c07ec2 100644 --- a/media/player/videojs/classes/plugin.php +++ b/media/player/videojs/classes/plugin.php @@ -359,7 +359,7 @@ class media_videojs_plugin extends core_media_player_native { $this->language = key($candidates); } else { // Could not match, use default language of video player (English). - $this->language = null; + $this->language = 'en'; } }