Merge pull request #163 from ezsystems/ezp-22859-object_relations

Fix EZP-22859: Object Relations versions not saved correctly in Solr
ezsystems · Jun 2, 2014 · d79ebcd · d79ebcd
2 parents 8585286 + 4ed347b
commit d79ebcd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/classes/ezfsolrdocumentfieldobjectrelation.php b/classes/ezfsolrdocumentfieldobjectrelation.php
@@ -297,12 +297,15 @@ public function getData()
                     $subObjectID = $relationItem['contentobject_id'];
                     if ( !$subObjectID )
                         continue;
-                    $subObject = eZContentObjectVersion::fetchVersion( $relationItem['contentobject_version'], $subObjectID );
+
+                    // Using last version of object (version inside xml data is the original version)
+                    $subObject = eZContentObject::fetch( $subObjectID );
+
                     if ( !$subObject || $relationItem['in_trash'] )
                         continue;
 
                     // 1st create aggregated metadata fields
-                    $metaAttributeValues = eZSolr::getMetaAttributesForObject( $subObject->attribute( 'contentobject' ) );
+                    $metaAttributeValues = eZSolr::getMetaAttributesForObject( $subObject );
                     foreach ( $metaAttributeValues as $metaInfo )
                     {
                         $submetaFieldName = ezfSolrDocumentFieldBase::generateSubmetaFieldName( $metaInfo['name'], $contentClassAttribute );