Drupal.civi-setup.php - Don't assume that `$language` is available

diff --git a/setup/plugins/init/Drupal.civi-setup.php b/setup/plugins/init/Drupal.civi-setup.php
index 75e7c5a3d4c87756ce88560e34dec84eb9c5860a..b24d7c164cba6e70d5b6b7ca8bd2ebbcc2c5bd74 100644 (file)
--- a/setup/plugins/init/Drupal.civi-setup.php
+++ b/setup/plugins/init/Drupal.civi-setup.php
@@ -59,7 +59,7 @@ if (!defined('CIVI_SETUP')) {
 
     // Compute default locale.
     global $language;
-    $model->lang = \Civi\Setup\LocaleUtil::pickClosest($language->langcode, $model->getField('lang', 'options'));
+    $model->lang = \Civi\Setup\LocaleUtil::pickClosest($language->langcode ?? NULL, $model->getField('lang', 'options'));
   });
 
 function _drupal_civisetup_getPublicFiles() {

diff --git a/setup/src/Setup/LocaleUtil.php b/setup/src/Setup/LocaleUtil.php
index fe0c9f0e6042b685345fdd87a511844bfe0db8e8..f996eb9a6680a3e79a0a67cda7fcb8d02a3bc4a2 100644 (file)
--- a/setup/src/Setup/LocaleUtil.php
+++ b/setup/src/Setup/LocaleUtil.php
@@ -19,6 +19,10 @@ class LocaleUtil {
    *   Ex: 'en_US'.
    */
   public static function pickClosest($preferredLang, $availLangs, $default = 'en_US') {
+    if ($preferredLang === NULL || $preferredLang === '') {
+      return $default;
+    }
+
     // Perhaps we have this exact language?
     if (isset($availLangs[$preferredLang])) {
       return $preferredLang;