[+BUGFIX] Extbase (Persistence): DataMapper now mapps NULL into a property on non...

diff --git a/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
index 693b9cb..5cd9bd8 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapper.php
@@ -448,7 +448,12 @@ class Tx_Extbase_Persistence_Mapper_DataMapper implements t3lib_Singleton {
                                }
                        } elseif (strpos($propertyMetaData['type'], '_') !== FALSE) {
                                if (is_array($result)) {
-                                       $propertyValue = current($result);
+                                       
+                                       if (current($result) !== FALSE) {
+                                               $propertyValue = current($result);
+                                       } else {
+                                               $propertyValue = NULL;
+                                       }
                                } else {
                                        $propertyValue = $result;
                                }