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 /app | |
| parent | f5b60dec5b2008942bb21825ea56f175562be22a (diff) | |
| download | webtrees-7091fc7d9689c53d49926f23899c212ee642e020.tar.gz webtrees-7091fc7d9689c53d49926f23899c212ee642e020.tar.bz2 webtrees-7091fc7d9689c53d49926f23899c212ee642e020.zip | |
PSR-1
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/TimelineController.php | 4 | ||||
| -rw-r--r-- | app/Date.php | 6 | ||||
| -rw-r--r-- | app/Report/ReportBase.php | 2 |
3 files changed, 6 insertions, 6 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 |