diff --git a/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php b/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php index 35db42c..ee5b813 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php +++ b/core/lib/Drupal/Core/Entity/EntityFormControllerNG.php @@ -83,7 +83,7 @@ public function buildEntity(array $form, array &$form_state) { // field API without changing existing entity fields that are not being // edited by this form. Values of fields handled by field API are copied // by field_attach_extract_form_values() below. - $values_excluding_fields = $info['fieldable'] ? array_diff_key($form_state['values'], field_info_instances($entity_type, $entity->bundle())) : $form_state['values']; + $values_excluding_fields = $info->isFieldable() ? array_diff_key($form_state['values'], field_info_instances($entity_type, $entity->bundle())) : $form_state['values']; $translation = $entity->getTranslation($this->getFormLangcode($form_state), FALSE); $definitions = $translation->getPropertyDefinitions(); foreach ($values_excluding_fields as $key => $value) { diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc index 6f10d83..a283ec7 100644 --- a/core/modules/field/field.multilingual.inc +++ b/core/modules/field/field.multilingual.inc @@ -197,7 +197,7 @@ function field_is_translatable($entity_type, $field) { */ function field_has_translation_handler($entity_type, $handler = NULL) { $info = entity_get_info($entity_type); - return $info->translatable; + return $info->isTranslatable(); } /** diff --git a/core/modules/translation_entity/translation_entity.admin.inc b/core/modules/translation_entity/translation_entity.admin.inc index 94c4e29..1e0453c 100644 --- a/core/modules/translation_entity/translation_entity.admin.inc +++ b/core/modules/translation_entity/translation_entity.admin.inc @@ -525,7 +525,7 @@ function translation_entity_translatable_batch($translatable, $field_name, &$con $query = Drupal::entityQuery($entity_type); $result = $query ->exists($query_field) - ->sort($info['entity_keys']['id']) + ->sort($info->getKey('id')) ->range($offset, 10) ->execute(); diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index 37ff243..eb6b9bd 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -451,7 +451,7 @@ function translation_entity_enabled($entity_type, $bundle = NULL) { $enabled = FALSE; $info = entity_get_info($entity_type); - if (!empty($info['translatable'])) { + if ($info->isTranslatable()) { $bundles = !empty($bundle) ? array($bundle) : array_keys(entity_get_bundles($entity_type)); foreach ($bundles as $bundle) { if (translation_entity_get_config($entity_type, $bundle, 'enabled')) {