diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 5acdd60..5a8d04d 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -246,8 +246,12 @@ function language_save_default_configuration($entity_type, $bundle, $values = ar * instead. */ function language_get_default_configuration($entity_type, $bundle) { + $default = ['langcode' => LanguageInterface::LANGCODE_SITE_DEFAULT, 'language_alterable' => false]; $config = ContentLanguageSettings::loadByEntityTypeBundle($entity_type, $bundle); - return ['langcode' => $config->getDefaultLangcode(), 'language_alterable' => $config->isLanguageAlterable()]; + if ($config) { + $default = ['langcode' => $config->getDefaultLangcode(), 'language_alterable' => $config->isLanguageAlterable()]; + } + return $default; } /** diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php index 1fee9de..607fb4c 100644 --- a/core/modules/language/src/Entity/ContentLanguageSettings.php +++ b/core/modules/language/src/Entity/ContentLanguageSettings.php @@ -183,6 +183,9 @@ public function isDefaultConfiguration() { * default values. */ public static function loadByEntityTypeBundle($entity_type_id, $bundle) { + if ($entity_type_id == NULL || $bundle == NULL) { + return NULL; + } $config = \Drupal::entityManager()->getStorage('language_content_settings')->load($entity_type_id . '.' . $bundle); if ($config == NULL) { $config = ContentLanguageSettings::create(['target_entity_type_id' => $entity_type_id, 'target_bundle' => $bundle]);