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

moodle · Feb 3, 2021 · 7fde34a · 7fde34a
2 parents 6d0b97a + c4c5eb9
commit 7fde34a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/media/player/videojs/classes/external/get_language.php b/media/player/videojs/classes/external/get_language.php
@@ -57,7 +57,11 @@ public static function execute_parameters() {
      * @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
@@ -359,7 +359,7 @@ protected function find_language() {
             $this->language = key($candidates);
         } else {
             // Could not match, use default language of video player (English).
-            $this->language = null;
+            $this->language = 'en';
         }
     }