EZP-29400 : ezobjectrelationlist - fix fatal error (ezsystems#1376)

ezpublishlegacy · Jul 11, 2018 · 6fd5f6c · 6fd5f6c
1 parent 7bf5ae6
commit 6fd5f6c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php b/kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php
@@ -1614,17 +1614,17 @@ function metaData( $contentObjectAttribute )
                 $subObjectVersionNum = $relationItem['contentobject_version'];
                 $subObject = eZContentObject::fetch( $subObjectID );
 
+                if ( !$subObject )
+                {
+                    continue;
+                }
+
                 // Using last version of object (version inside xml data is the original version)
                 $subCurrentVersionObject = $subObject->currentVersion();
                 if( $subCurrentVersionObject instanceof eZContentObjectVersion )
                 {
                     $subObjectVersionNum = $subCurrentVersionObject->attribute( 'version' );
                 }
-
-                if ( !$subObject )
-                {
-                    continue;
-                }
                 $attributes = $subObject->contentObjectAttributes( true, $subObjectVersionNum, $language );
             }