diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/LanguageItem.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/LanguageItem.php index b0d8d73..387c103 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/DataType/LanguageItem.php +++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/LanguageItem.php @@ -87,21 +87,15 @@ public function setValue($values, $notify = TRUE) { /** * {@inheritdoc} */ - public function applyDefaultValue() { - if (isset($this->definition['settings']['default_value'])) { - $value = $this->definition['settings']['default_value']; + public function applyDefaultValue($notify = TRUE) { + // Default to LANGCODE_NOT_SPECIFIED. + if (module_exists('language') && $entity = $this->getParent()->getEntity()) { + $langcode = language_get_default_langcode($entity->entityType(), $entity->bundle()); } else { - if (module_exists('language') && $entity = $this->parent) { - $langcode = language_get_default_langcode($entity->entityType(), $entity->bundle()); - } - else { - $langcode = LANGUAGE_NOT_SPECIFIED; - } - // Default to one field item. - $value = array('value' => $langcode); + $langcode = Language::LANGCODE_NOT_SPECIFIED; } - $this->setValue(array(0 => $value)); + $this->setValue(array('value' => $langcode), $notify); return $this; }