Fixed #9966

craftcms · Oct 25, 2021 · 1bfa15a · 1bfa15a
1 parent c90bcb2
commit 1bfa15a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Fixed a bug where `craft\helpers\Html::parseTagAttributes()` was including trailing tabs, newlines, and other non-space whitespace characters in the parsed values of unquoted attributes. ([#9997](https://github.com/craftcms/cms/pull/9997))
 - Fixed an error that could occur if the `log` component was configured with a custom log target and `flushInterval` set to `1`.
 - Fixed a bug where `plugin/*` commands weren’t always handling failures properly. ([#9984](https://github.com/craftcms/cms/issues/9984))
+- Fixed a bug where entry title changes could be overlooked when merging upstream changes into a draft. ([#9966](https://github.com/craftcms/cms/issues/9966))
 
 ## 3.7.17.2 - 2021-10-21
 

diff --git a/src/services/Elements.php b/src/services/Elements.php
@@ -2871,8 +2871,10 @@ private function _propagateElement(ElementInterface $element, array $siteInfo, $
             $siteElement->title = $element->title;
         }
 
-        // Copy the dirty attributes
-        $siteElement->setDirtyAttributes($element->getDirtyAttributes());
+        // Copy the dirty attributes (except title, which may be translatable)
+        $siteElement->setDirtyAttributes(array_filter($element->getDirtyAttributes(), function(string $attribute): bool {
+            return $attribute !== 'title';
+        }));
 
         // Copy any non-translatable field values
         if ($element::hasContent()) {