diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-07-25 20:41:16 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-07-25 20:41:16 +0000 |
| commit | 2c09ead00de35775ba2b76985f0c155a37d9cab7 (patch) | |
| tree | 8db621e4712472af67df1e0e7a9d0d476fd5e69b | |
| parent | 70cbd316dcd13ba185cce80a40785d1493ebd731 (diff) | |
| download | webtrees-2c09ead00de35775ba2b76985f0c155a37d9cab7.tar.gz webtrees-2c09ead00de35775ba2b76985f0c155a37d9cab7.tar.bz2 webtrees-2c09ead00de35775ba2b76985f0c155a37d9cab7.zip | |
#1080013 - different notes are not shown if first line is the same
| -rw-r--r-- | includes/functions/functions_print.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 715f323d9f..e9eaed825d 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -514,13 +514,15 @@ function print_fact_notes($factrec, $level, $textOnly=false, $return=false) { $ged_id=get_id_from_gedcom($GEDCOM); $data = ""; + $previous_spos = 0; $nlevel = $level+1; $ct = preg_match_all("/$level NOTE(.*)/", $factrec, $match, PREG_SET_ORDER); for ($j=0; $j<$ct; $j++) { $nid = str_replace("@","",$match[$j][1]); - $spos1 = strpos($factrec, $match[$j][0]); + $spos1 = strpos($factrec, $match[$j][0], $previous_spos); $spos2 = strpos($factrec."\n$level", "\n$level", $spos1+1); if (!$spos2) $spos2 = strlen($factrec); + $previous_spos = $spos2; $nrec = substr($factrec, $spos1, $spos2-$spos1); if (!isset($match[$j][1])) $match[$j][1]=""; $nt = preg_match("/@(.*)@/", $match[$j][1], $nmatch); |