Merge branch 'MDL-70535' of git://github.com/paulholden/moodle

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);
     }

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';
         }
     }