Merge branch '5.1' into 5.2

This commit is contained in:
Robbie Averill 2018-09-22 13:42:11 +02:00
commit 6176cf63b8

View File

@ -71,6 +71,11 @@ class UpgradePolymorphicExtension extends DataExtension
continue; continue;
} }
// Don't rewrite class values when an existing value is set and is an instance of UserDefinedForm
if ($relationshipObject instanceof UserDefinedForm) {
continue;
}
$entry->$fieldName = $this->defaultReplacement; $entry->$fieldName = $this->defaultReplacement;
try { try {
$entry->write(); $entry->write();