diff core/lib/Drupal/Core/Entity/ContentEntityBase.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)

--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php	Fri Feb 23 15:52:07 2018 +0000
@@ -713,6 +713,12 @@
         elseif (isset($this->translatableEntityKeys[$key][$this->activeLangcode])) {
           unset($this->translatableEntityKeys[$key][$this->activeLangcode]);
         }
+        // If the revision identifier field is being populated with the original
+        // value, we need to make sure the "new revision" flag is reset
+        // accordingly.
+        if ($key === 'revision' && $this->getRevisionId() == $this->getLoadedRevisionId()) {
+          $this->newRevision = FALSE;
+        }
       }
     }