diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index 41d96f1..220f459 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -591,9 +591,9 @@ protected function setDefaultLangcode() { if (empty($this->defaultLangcode)) { // Make sure we return a proper language object, if the entity has a - // langcode field, default to the current language. + // langcode field, default to the site's default language. if ($this->hasField('langcode')) { - $this->defaultLangcode = $this->languageManager()->getCurrentLanguage()->getId(); + $this->defaultLangcode = $this->languageManager()->getDefaultLanguage()->getId(); } else { $this->defaultLangcode = LanguageInterface::LANGCODE_NOT_SPECIFIED; diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php index b2bcde1..961eb67 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php @@ -91,8 +91,9 @@ public function setValue($values, $notify = TRUE) { * {@inheritdoc} */ public function applyDefaultValue($notify = TRUE) { - // Default to the current site language. - $this->setValue(array('value' => \Drupal::languageManager()->getCurrentLanguage()->getId()), $notify); + // Default to the site's default language. When language module is enabled, + // this behavior is configurable, see language_field_info_alter(). + $this->setValue(array('value' => \Drupal::languageManager()->getDefaultLanguage()->getId()), $notify); return $this; }