From f5b60dec5b2008942bb21825ea56f175562be22a Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Mon, 2 Mar 2015 14:28:39 +0000 Subject: PSR-1 --- includes/functions/functions_import.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'includes/functions/functions_import.php') diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php index 0f704e2cf7..4e49f9eee8 100644 --- a/includes/functions/functions_import.php +++ b/includes/functions/functions_import.php @@ -873,9 +873,31 @@ function update_dates($xref, $ged_id, $gedrec) { $fact = $tmatch[1]; } $date = new Date($match[2]); - $sql_insert_date->execute(array($date->date1->d, $date->date1->format('%O'), $date->date1->m, $date->date1->y, $date->date1->minJD, $date->date1->maxJD, $fact, $xref, $ged_id, $date->date1->format('%@'))); - if ($date->date2) { - $sql_insert_date->execute(array($date->date2->d, $date->date2->format('%O'), $date->date2->m, $date->date2->y, $date->date2->minJD, $date->date2->maxJD, $fact, $xref, $ged_id, $date->date2->format('%@'))); + $sql_insert_date->execute(array( + $date->minimumDate()->d, + $date->minimumDate()->format('%O'), + $date->minimumDate()->m, + $date->minimumDate()->y, + $date->minimumDate()->minJD, + $date->minimumDate()->maxJD, + $fact, + $xref, + $ged_id, + $date->minimumDate()->format('%@'), + )); + if ($date->minimumDate() !== $date->maximumDate()) { + $sql_insert_date->execute(array( + $date->maximumDate()->d, + $date->maximumDate()->format('%O'), + $date->maximumDate()->m, + $date->maximumDate()->y, + $date->maximumDate()->minJD, + $date->maximumDate()->maxJD, + $fact, + $xref, + $ged_id, + $date->maximumDate()->format('%@'), + )); } } } -- cgit v1.3