From 9af697c53bfb03c48b2fb145f85df529b635aa65 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 23 Sep 2019 11:46:19 +0100
Subject: [PATCH] =?UTF-8?q?Issue=20#3082289=20by=20Krzysztof=20Doma=C5=84s?=
=?UTF-8?q?ki,=20alexpott:=20\Drupal\Core\Field\Plugin\Field\FieldType\Ent?=
=?UTF-8?q?ityReferenceItem::onDependencyRemoval()=20sets=20auto=5Fcreate?=
=?UTF-8?q?=20to=20an=20invalid=20data=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php | 2 +-
.../src/Functional/EntityReference/EntityReferenceAdminTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index baf83b6011ea..0cca90472bf3 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -551,7 +551,7 @@ public static function onDependencyRemoval(FieldDefinitionInterface $field_defin
// setting, disable the auto-creation feature completely.
$auto_create_bundle = !empty($handler_settings['auto_create_bundle']) ? $handler_settings['auto_create_bundle'] : FALSE;
if ($auto_create_bundle && $auto_create_bundle == $bundle->id()) {
- $handler_settings['auto_create'] = NULL;
+ $handler_settings['auto_create'] = FALSE;
$handler_settings['auto_create_bundle'] = NULL;
}
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index 8510539c5683..9d82101c0ad4 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -335,7 +335,7 @@ public function testMultipleTargetBundles() {
// should be reset (no auto-creation).
$vocabularies[1]->delete();
$field_config = FieldConfig::load($field_id);
- $this->assertFalse($field_config->getSetting('handler_settings')['auto_create']);
+ $this->assertSame(FALSE, $field_config->getSetting('handler_settings')['auto_create']);
$this->assertFalse(isset($field_config->getSetting('handler_settings')['auto_create_bundle']));
}
--
GitLab