Added type checks for more reliability

DeuxHuitHuit · Dec 4, 2014 · c36f8fa · c36f8fa
1 parent cfa3ab2
commit c36f8fa
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/fields/field.link_preview.php b/fields/field.link_preview.php
@@ -227,7 +227,7 @@ private function applyFormat($entryId, $format, $sectionId) {
 			$section = SectionManager::fetch($sectionId);
 			$fields = $section->fetchFields();
 
-			if (empty($entryData)) {
+			if (!is_array($entryData) || empty($entryData)) {
 				return __('Entry not found');
 			}
 
@@ -308,7 +308,9 @@ public static function getFieldValue($field, $fieldValues, $qualifier) {
 					$relatedEntry = EntryManager::fetch($fieldValues['relation_id']);
 					$relatedFields = $field->get('related_field_id');
 					$relatedData = $relatedEntry[0]->getData($relatedFields[0], false);
-
+					if (empty($relatedEntry) || empty($relatedFields)) {
+						continue;
+					}
 					//var_dump($relatedData, $fieldValues, $field->get());die;
 					$value = $relatedData['handle'];
 					if (empty($value) || $qualifier == 'value') {