summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2019-01-18 11:07:43 (GMT)
committerNathaniel Catchpole2019-01-18 11:07:43 (GMT)
commitc59f10b92876e5eaf09b90e175fab73209d34bc6 (patch)
treeaed8b12643efc9cac5f18655e94d2e618d09d5ec
parent898083ce7bd89e65360bb581ec174ee01c1b1e7f (diff)
Revert "Issue #3003238 by Sam152, amateescu, Berdir: EntityStorageException: Default revision can not be deleted in content_moderation_entity_revision_delete()"8.7.x
This reverts commit 2492cdda1c440c51dd1b9a1d4439fa33b80cda99.
-rw-r--r--core/modules/content_moderation/src/EntityOperations.php9
-rw-r--r--core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php24
2 files changed, 4 insertions, 29 deletions
diff --git a/core/modules/content_moderation/src/EntityOperations.php b/core/modules/content_moderation/src/EntityOperations.php
index 52d2ca3..8c6d332 100644
--- a/core/modules/content_moderation/src/EntityOperations.php
+++ b/core/modules/content_moderation/src/EntityOperations.php
@@ -235,11 +235,10 @@ class EntityOperations implements ContainerInjectionInterface {
* @see hook_entity_revision_delete()
*/
public function entityRevisionDelete(EntityInterface $entity) {
- if ($content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity)) {
- if ($content_moderation_state->isDefaultRevision()) {
- $content_moderation_state->delete();
- }
- else {
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+ if (!$entity->isDefaultRevision()) {
+ $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
+ if ($content_moderation_state) {
$this->entityTypeManager
->getStorage('content_moderation_state')
->deleteRevision($content_moderation_state->getRevisionId());
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 373d01f..1a1b6e4 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -239,30 +239,6 @@ class ContentModerationStateTest extends KernelTestBase {
}
/**
- * Tests removal of content moderation state entities for preexisting content.
- */
- public function testExistingContentModerationStateDataRemoval() {
- $storage = $this->entityTypeManager->getStorage('entity_test_mulrevpub');
-
- $entity = $storage->create([]);
- $entity->save();
- $original_revision_id = $entity->getRevisionId();
-
- $workflow = $this->createEditorialWorkflow();
- $workflow->getTypePlugin()->addEntityTypeAndBundle($entity->getEntityTypeId(), $entity->bundle());
- $workflow->save();
-
- $entity->moderation_state = 'draft';
- $entity->save();
-
- $storage->deleteRevision($entity->getRevisionId());
-
- $entity = $this->reloadEntity($entity);
- $this->assertEquals('published', $entity->moderation_state->value);
- $this->assertEquals($original_revision_id, $storage->getLatestRevisionId($entity->id()));
- }
-
- /**
* Tests removal of content moderation state translations.
*
* @dataProvider basicModerationTestCases