diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-03-02 14:44:29 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-03-02 14:44:29 +0000 |
| commit | 7091fc7d9689c53d49926f23899c212ee642e020 (patch) | |
| tree | 7c07c40006d01ddc1dca8bc05908bab815a8c50d | |
| parent | f5b60dec5b2008942bb21825ea56f175562be22a (diff) | |
| download | webtrees-7091fc7d9689c53d49926f23899c212ee642e020.tar.gz webtrees-7091fc7d9689c53d49926f23899c212ee642e020.tar.bz2 webtrees-7091fc7d9689c53d49926f23899c212ee642e020.zip | |
PSR-1
| -rw-r--r-- | app/Controller/TimelineController.php | 4 | ||||
| -rw-r--r-- | app/Date.php | 6 | ||||
| -rw-r--r-- | app/Report/ReportBase.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 8 | ||||
| -rw-r--r-- | individual.php | 4 | ||||
| -rw-r--r-- | modules_v3/GEDFact_assistant/CENS_ctrl.php | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/app/Controller/TimelineController.php b/app/Controller/TimelineController.php index 6b41f0482b..0267e12ada 100644 --- a/app/Controller/TimelineController.php +++ b/app/Controller/TimelineController.php @@ -219,12 +219,12 @@ class TimelineController extends PageController { } elseif ($record instanceof Family) { echo $gdate->display(); if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) { - $ageh = get_age_at_event(Date::GetAgeGedcom($record->getHusband()->getBirthDate(), $gdate), false); + $ageh = get_age_at_event(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate), false); } else { $ageh = null; } if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) { - $agew = get_age_at_event(Date::GetAgeGedcom($record->getWife()->getBirthDate(), $gdate), false); + $agew = get_age_at_event(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate), false); } else { $agew = null; } diff --git a/app/Date.php b/app/Date.php index c36e778171..5191ff431c 100644 --- a/app/Date.php +++ b/app/Date.php @@ -484,13 +484,13 @@ class Date { * * @return string */ - public static function GetAgeGedcom(Date $d1, Date $d2 = null, $warn_on_negative = true) { + public static function getAgeGedcom(Date $d1, Date $d2 = null, $warn_on_negative = true) { if (is_null($d2)) { - return $d1->date1->GetAge(true, WT_CLIENT_JD, $warn_on_negative); + return $d1->date1->getAge(true, WT_CLIENT_JD, $warn_on_negative); } else { // If dates overlap, then can’t calculate age. if (self::compare($d1, $d2)) { - return $d1->date1->GetAge(true, $d2->minimumJulianDay(), $warn_on_negative); + return $d1->date1->getAge(true, $d2->minimumJulianDay(), $warn_on_negative); } elseif (self::compare($d1, $d2) == 0 && $d1->date1->minJD == $d2->minimumJulianDay()) { return '0d'; } else { diff --git a/app/Report/ReportBase.php b/app/Report/ReportBase.php index 36877f0667..a246229ab9 100644 --- a/app/Report/ReportBase.php +++ b/app/Report/ReportBase.php @@ -1940,7 +1940,7 @@ function ageAtDeathStartHandler() { } $value = ''; if (Date::compare($birth_date, $death_date) <= 0 || !$person->isDead()) { - $age = Date::GetAgeGedcom($birth_date, $death_date); + $age = Date::getAgeGedcom($birth_date, $death_date); // Only show calculated age if it differs from recorded age if ($age != '' && $age != "0d") { if ($fact_age != '' && $fact_age != $age || $fact_age == '' && $husb_age == '' && $wife_age == '' || $husb_age != '' && $person->getSex() == 'M' && $husb_age != $age || $wife_age != '' && $person->getSex() == 'F' && $wife_age != $age diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index de9be39775..5ed646459f 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -395,7 +395,7 @@ function format_fact_date(Fact $event, GedcomRecord $record, $anchor, $time) { $ageText = ''; if ((Date::compare($date, $death_date) <= 0 || !$record->isDead()) || $fact == 'DEAT') { // Before death, print age - $age = Date::GetAgeGedcom($birth_date, $date); + $age = Date::getAgeGedcom($birth_date, $date); // Only show calculated age if it differs from recorded age if ($age != '') { if ( @@ -412,9 +412,9 @@ function format_fact_date(Fact $event, GedcomRecord $record, $anchor, $time) { } if ($fact != 'DEAT' && Date::compare($date, $death_date) >= 0) { // After death, print time since death - $age = get_age_at_event(Date::GetAgeGedcom($death_date, $date), true); + $age = get_age_at_event(Date::getAgeGedcom($death_date, $date), true); if ($age != '') { - if (Date::GetAgeGedcom($death_date, $date) == "0d") { + if (Date::getAgeGedcom($death_date, $date) == "0d") { $ageText = '(' . I18N::translate('on the date of death') . ')'; } else { $ageText = '(' . $age . ' ' . I18N::translate('after death') . ')'; @@ -436,7 +436,7 @@ function format_fact_date(Fact $event, GedcomRecord $record, $anchor, $time) { $death_date = $indi->getDeathDate(); $ageText = ''; if (Date::compare($date, $death_date) <= 0) { - $age = Date::GetAgeGedcom($birth_date, $date); + $age = Date::getAgeGedcom($birth_date, $date); // Only show calculated age if it differs from recorded age if ($age != '' && $age > 0) { if ( diff --git a/individual.php b/individual.php index 776ccab705..1c10b55160 100644 --- a/individual.php +++ b/individual.php @@ -170,10 +170,10 @@ if ($controller->record->canShow()) { echo '<span class="header_age">'; if ($bdate->isOK() && !$controller->record->isDead()) { // If living display age - echo WT_Gedcom_Tag::getLabelValue('AGE', get_age_at_event(Date::GetAgeGedcom($bdate), true), $controller->record, 'span'); + echo WT_Gedcom_Tag::getLabelValue('AGE', get_age_at_event(Date::getAgeGedcom($bdate), true), $controller->record, 'span'); } elseif ($bdate->isOK() && $ddate->isOK()) { // If dead, show age at death - echo WT_Gedcom_Tag::getLabelValue('AGE', get_age_at_event(Date::GetAgeGedcom($bdate, $ddate), false), $controller->record, 'span'); + echo WT_Gedcom_Tag::getLabelValue('AGE', get_age_at_event(Date::getAgeGedcom($bdate, $ddate), false), $controller->record, 'span'); } echo '</span>'; // Display summary birth/death info. diff --git a/modules_v3/GEDFact_assistant/CENS_ctrl.php b/modules_v3/GEDFact_assistant/CENS_ctrl.php index e3dc9d6c61..00b267e165 100644 --- a/modules_v3/GEDFact_assistant/CENS_ctrl.php +++ b/modules_v3/GEDFact_assistant/CENS_ctrl.php @@ -58,7 +58,7 @@ $summary = $person->formatFirstMajorFact(WT_EVENTS_BIRT, 2); if (!($person->isDead())) { // If alive display age $bdate = $person->getBirthDate(); - $age = Date::GetAgeGedcom($bdate); + $age = Date::getAgeGedcom($bdate); if ($age != "") { $summary .= "<span class=\"label\">" . I18N::translate('Age') . ":</span><span class=\"field\"> " . get_age_at_event($age, true) . "</span>"; } |
