Merge pull request #32 from Nattfarinn/master

(WIP) EZP-24779 fix: prevent error if image is related to non-existing object
ezsystems · Sep 16, 2015 · d6ef984 · d6ef984
2 parents 09b1922 + 30c3eff
commit d6ef984
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Rest/Field/Value.php b/Rest/Field/Value.php
@@ -101,7 +101,9 @@ private function getImageFieldIdentifier($contentId, $language, $related = false
         } elseif (in_array('ezobjectrelation', $fieldDefinitions) && !$related) {
             $field = $content->getFieldValue($fieldNames['ezobjectrelation'], $language);
 
-            return $this->getImageFieldIdentifier($field->destinationContentId, $language, true);
+            if (!empty($field->destinationContentId)) {
+                return $this->getImageFieldIdentifier($field->destinationContentId, $language, true);
+            }
         } else {
             return $this->getConfiguredFieldIdentifier('image', $contentType);
         }