Merge branch '5.x' into 6.x

Author: angrybrad

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fixed a bug where duplicate users could get created when importing entry authors with a matching email address. ([#1612](https://github.com/craftcms/feed-me/pull/1612))
 - Fixed a bug where importing into a Matrix field with “Use default value” selected, subfields could use the default value in certain scenarios. ([#1613](https://github.com/craftcms/feed-me/pull/1613))
 - Fixed a bug that could occur on PostgreSQL when using the `setEmptyValues` feed setting. ([#1620](https://github.com/craftcms/feed-me/pull/1620))
+- Fixed a bug that could occur when saving empty ("") values if `compareContent` and “Set Empty Values” were both enabled. ([#1621](https://github.com/craftcms/feed-me/pull/1621))
 
 ## 6.8.0 - 2025-03-14
 - 

src/helpers/DataHelper.php

@@ -454,6 +454,17 @@ private static function _compareSimpleValues($fields, $key, $firstValue, $second
             return true;
         }
 
+        // and if everything else failed, we might have a situation where the $fields[$key] value is empty (null)
+        // in which case Hash::extract will return an empty array and therefore Hash::check fill return false
+        // and the values won't actually be compared
+        // @see https://github.com/craftcms/feed-me/issues/1615
+        if (
+            array_key_exists($key, $fields) &&
+            (!is_numeric($firstValue) && !is_bool($firstValue) && empty($firstValue)) &&
+            (!is_numeric($secondValue) && !is_bool($secondValue) && empty($secondValue))) {
+            return true;
+        }
+
         // Didn't match
         return false;
     }