diff options
| -rw-r--r-- | library/WT/Report/Base.php | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/library/WT/Report/Base.php b/library/WT/Report/Base.php index d55c9f0410..23ce35043b 100644 --- a/library/WT/Report/Base.php +++ b/library/WT/Report/Base.php @@ -3775,16 +3775,9 @@ function get_gedcom_value($tag, $level, $gedrec, $truncate='') { if ($ct > 0) { $value = trim($match[1]); if ($t=='NOTE' && preg_match('/^@(.+)@$/', $value, $match)) { - $oldsub = $subrec; - $subrec = find_other_record($match[1], $ged_id); - if ($subrec) { - $value=$match[1]; - $ct = preg_match("/0 @$match[1]@ $t (.+)/", $subrec, $match); - if ($ct>0) { - $value = $match[1]; - $level = 0; - } else - $subrec = $oldsub; + $note = WT_Note::getInstance($match[1]); + if ($note) { + $value = $note->getNote(); } else { //-- set the value to the id without the @ $value = $match[1]; @@ -3793,8 +3786,6 @@ function get_gedcom_value($tag, $level, $gedrec, $truncate='') { if ($level!=0 || $t!="NOTE") { $value .= get_cont($level+1, $subrec); } - $value = preg_replace("'\n'", "", $value); - $value = preg_replace("'<br>'", "\n", $value); return $value; } return ""; |