[~CONFIGURATION] Extbase: Set lockType to empty string instead of 'system'.
[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Classes / Property / Mapper.php
index db164d7..322e3aa 100644 (file)
@@ -196,7 +196,7 @@ class Tx_Extbase_Property_Mapper {
                                if ($targetClassSchema !== NULL && $targetClassSchema->hasProperty($propertyName)) {
                                        $propertyMetaData = $targetClassSchema->getProperty($propertyName);
 
-                                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'Tx_Extbase_Persistence_ObjectStorage')) && strpos($propertyMetaData['elementType'], '_') !== FALSE) {
+                                       if (in_array($propertyMetaData['type'], array('array', 'ArrayObject', 'Tx_Extbase_Persistence_ObjectStorage', 'Tx_Extbase_Persistence_LazyObjectStorage')) && strpos($propertyMetaData['elementType'], '_') !== FALSE) {
                                                $objects = array();
                                                foreach ($propertyValue as $value) {
                                                        $objects[] = $this->transformToObject($value, $propertyMetaData['elementType'], $propertyName);
@@ -205,7 +205,7 @@ class Tx_Extbase_Property_Mapper {
                                                        // make sure we hand out what is expected
                                                if ($propertyMetaData['type'] === 'ArrayObject') {
                                                        $propertyValue = new ArrayObject($objects);
-                                               } elseif ($propertyMetaData['type']=== 'Tx_Extbase_Persistence_ObjectStorage') {
+                                               } elseif ($propertyMetaData['type'] === 'Tx_Extbase_Persistence_ObjectStorage' || $propertyMetaData['type'] === 'Tx_Extbase_Persistence_LazyObjectStorage') {
                                                        $propertyValue = new Tx_Extbase_Persistence_ObjectStorage();
                                                        foreach ($objects as $object) {
                                                                $propertyValue->attach($object);