Merge branch 'master' of github.com:HansSchouten/PHPagebuilder

HansSchouten · Mar 22, 2021 · f6c3fa0 · f6c3fa0
2 parents 22cc959 + 8eeac2e
commit f6c3fa0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Modules/GrapesJS/resources/views/pagebuilder.php b/src/Modules/GrapesJS/resources/views/pagebuilder.php
@@ -30,8 +30,8 @@
 CKEDITOR.dtd.$editable.ul = 1;
 CKEDITOR.dtd.$editable.table = 1;
 
-window.currentLanguage = <?= json_encode(phpb_config('general.language')) ?>;
 window.languages = <?= json_encode(phpb_active_languages()) ?>;
+window.currentLanguage = <?= in_array(phpb_config('general.language'), phpb_active_languages()) ? json_encode(phpb_config('general.language')) : json_encode(array_keys(phpb_active_languages())[0]) ?>;
 window.translations = <?= json_encode(phpb_trans('pagebuilder')) ?>;
 window.contentContainerComponents = <?= json_encode($pageBuilder->getPageComponents($page)) ?>;
 window.themeBlocks = <?= json_encode($blocks) ?>;