wait #6248 @0.25

diff --git a/app/Elearning/QuizCompiler/L10N.php b/app/Elearning/QuizCompiler/L10N.php
index 5092e434329226c5e5bf16eed161a56aa45eea5a..c440591622623fc598be3fc7e9709bf08dfe7df2 100644 (file)
--- a/app/Elearning/QuizCompiler/L10N.php
+++ b/app/Elearning/QuizCompiler/L10N.php
@@ -14,6 +14,9 @@ trait L10N
     protected function getTranslations()
     {
         $res = ElearningTranslate::getLocaleTranslations($this->data->translation, true);
-        return array_merge($res, $this->data->translations);
+        if (is_array($this->data->translations)) {
+            $res = array_merge($res, $this->data->translations);
+        }
+        return $res;
     }
 }