[~TASK] Extbase (Persistence): Exchanged "+" oprator with array_merge.
authorJochen Rau <j.rau@web.de>
Tue, 15 Jun 2010 10:02:29 +0000 (10:02 +0000)
committerJochen Rau <j.rau@web.de>
Tue, 15 Jun 2010 10:02:29 +0000 (10:02 +0000)
typo3/sysext/extbase/Classes/Persistence/Mapper/DataMapFactory.php

index aad8a1e..ca13337 100644 (file)
@@ -76,7 +76,7 @@ class Tx_Extbase_Persistence_Mapper_DataMapFactory {
                        if (isset($classSettings['mapping']['tableName']) && strlen($classSettings['mapping']['tableName']) > 0) {
                                $tableName = $classSettings['mapping']['tableName'];
                        }
-                       $classHierachy = array($className) + class_parents($className);
+                       $classHierachy = array_merge(array($className), class_parents($className));
                        foreach ($classHierachy as $currentClassName) {
                                if (in_array($currentClassName, array('Tx_Extbase_DomainObject_AbstractEntity', 'Tx_Extbase_DomainObject_AbstractValueObject'))) {
                                        break;
@@ -176,7 +176,7 @@ class Tx_Extbase_Persistence_Mapper_DataMapFactory {
         * @return void
         */
        protected function setRelations(Tx_Extbase_Persistence_Mapper_ColumnMap $columnMap, $columnConfiguration, $propertyMetaData) {
-               if (isset($columnConfiguration) && $columnConfiguration['type'] !== 'passthrough') {
+               if (isset($columnConfiguration)) {
                        if (isset($propertyMetaData['elementType'])) {
                                if (isset($columnConfiguration['MM']) || isset($columnConfiguration['foreign_selector'])) {
                                        $columnMap = $this->setManyToManyRelation($columnMap, $columnConfiguration);