diff --git a/core/modules/language/language.module b/core/modules/language/language.module index ee961d6..e5aa96a 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -289,17 +289,7 @@ function language_configuration_element_submit(&$form, &$form_state) { // values. if (isset($form_state['language'])) { foreach ($form_state['language'] as $element_name => $values) { - // When creating a new bundle, bundle key is empty, as it was not set on - // form creation. - if (!isset($values['bundle'])) { - $values['bundle'] = $form_state['controller']->getEntity()->id(); - } - // When renaming the bundle, old config values has to be deleted. - elseif ($values['bundle'] != $form_state['controller']->getEntity()->id()) { - language_clear_default_configuration($values['entity_type'], $values['bundle']); - $values['bundle'] = $form_state['controller']->getEntity()->id(); - } - language_save_default_configuration($values['entity_type'], $values['bundle'], $form_state['values'][$element_name]); + language_save_default_configuration($values['entity_type'], $values['bundle'], $form_state['values'][$element_name]); } } } @@ -376,6 +366,16 @@ function language_get_default_configuration_settings_key($entity_type, $bundle) } /** + * Implements hook_node_type_update(). + */ +function language_node_type_update(NodeTypeInterface $type) { + if ($type->original->id() != $type->id()) { + language_save_default_configuration('node', $type->id(), language_get_default_configuration('node', $type->original->id())); + language_clear_default_configuration('node', $type->original->id()); + } +} + +/** * Returns the default language code assigned to an entity type and a bundle. * * @param string $entity_type