diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-08-18 10:53:29 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-08-18 10:53:29 +0100 |
| commit | 2b41a0ab5f96775c513170c2476562e9f138a57e (patch) | |
| tree | 9ef71dbbd94d608d2604a22f94ae62486bf7b778 /app/Stats.php | |
| parent | 68107c02830e297684efd27acc9b1096ab2b3adc (diff) | |
| download | webtrees-2b41a0ab5f96775c513170c2476562e9f138a57e.tar.gz webtrees-2b41a0ab5f96775c513170c2476562e9f138a57e.tar.bz2 webtrees-2b41a0ab5f96775c513170c2476562e9f138a57e.zip | |
Fix: #1828 and #1829 - zero ages in charts
Diffstat (limited to 'app/Stats.php')
| -rw-r--r-- | app/Stats.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/Stats.php b/app/Stats.php index f84f6dffb7..2779b8e258 100644 --- a/app/Stats.php +++ b/app/Stats.php @@ -2771,25 +2771,25 @@ class Stats } $chxl .= $this->centuryName($century) . '|'; $average = 0; - if (isset($values->F)) { - $countsf .= $values->F . ','; - $average = $values->F; + if (isset($values['F'])) { + $countsf .= $values['F'] . ','; + $average = $values['F']; } else { $countsf .= '0,'; } - if (isset($values->M)) { - $countsm .= $values->M . ','; + if (isset($values['M'])) { + $countsm .= $values['M'] . ','; if ($average == 0) { - $countsa .= $values->M . ','; + $countsa .= $values['M'] . ','; } else { - $countsa .= (($values->M + $average) / 2) . ','; + $countsa .= (($values['M'] + $average) / 2) . ','; } } else { $countsm .= '0,'; if ($average == 0) { $countsa .= '0,'; } else { - $countsa .= $values->F . ','; + $countsa .= $values['F'] . ','; } } } @@ -4172,24 +4172,24 @@ class Stats } $chxl .= $this->centuryName($century) . '|'; $average = 0; - if (isset($values->F)) { + if (isset($values['F'])) { if ($max <= 50) { - $value = $values->F * 2; + $value = $values['F'] * 2; } else { - $value = $values->F; + $value = $values['F']; } $countsf .= $value . ','; $average = $value; - $chmf .= 't' . $values->F . ',000000,1,' . $i . ',11,1|'; + $chmf .= 't' . $values['F'] . ',000000,1,' . $i . ',11,1|'; } else { $countsf .= '0,'; $chmf .= 't0,000000,1,' . $i . ',11,1|'; } - if (isset($values->M)) { + if (isset($values['M'])) { if ($max <= 50) { - $value = $values->M * 2; + $value = $values['M'] * 2; } else { - $value = $values->M; + $value = $values['M']; } $countsm .= $value . ','; if ($average == 0) { @@ -4197,7 +4197,7 @@ class Stats } else { $countsa .= (($value + $average) / 2) . ','; } - $chmm .= 't' . $values->M . ',000000,0,' . $i . ',11,1|'; + $chmm .= 't' . $values['M'] . ',000000,0,' . $i . ',11,1|'; } else { $countsm .= '0,'; if ($average == 0) { |