diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index ed6d76c..fffd1df 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -1269,7 +1269,7 @@ public function hasTranslationChanges() { foreach ($this->getFieldDefinitions() as $field_name => $definition) { // @todo Avoid special-casing the following fields. See // https://www.drupal.org/node/2329253. - if ($field_name == 'revision_translation_affected' || $field_name == 'revision_id') { + if ($field_name == 'revision_translation_affected' || $field_name == 'revision_id' || ($this->getEntityType()->hasKey('revision_uuid') && $field_name == $this->getEntityType()->getKey('revision_uuid'))) { continue; } if (!$definition->isComputed() && (!$translated || $definition->isTranslatable())) { diff --git a/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php index 017d5eb..083db64 100644 --- a/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php +++ b/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php @@ -35,7 +35,7 @@ public function testFilter() { $expected_result[] = array('nid' => $node->id()); $revision = clone $node; // Force to add a new revision. - $revision->set('vid', NULL); + $revision->setNewRevision(TRUE); $revision->set('revision_uid', $author->id()); $revision->save();