Fix: link from media to non-existing note causes null-pointer exception

fisharebest · Aug 11, 2019 · 4dcd46f · 4dcd46f
1 parent 761225c
commit 4dcd46f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/app/Media.php b/app/Media.php
@@ -106,16 +106,20 @@ protected static function fetchGedcomRecord($xref, $tree_id)
     public function getNote()
     {
         $note = $this->getFirstFact('NOTE');
-        if ($note) {
-            $text = $note->getValue();
-            if (preg_match('/^@' . WT_REGEX_XREF . '@$/', $text)) {
-                $text = $note->getTarget()->getNote();
+
+        if ($note instanceof Fact) {
+            $target = $note->getTarget();
+
+            if ($target instanceof Note) {
+                $text = $target->getNote();
+            } else {
+                $text = $note->getValue();
             }
 
             return $text;
-        } else {
-            return '';
         }
+
+        return '';
     }
 
     /**