diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-07-26 20:57:22 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-07-26 20:57:22 +0000 |
| commit | 5ab17e6894e8a7bc612d3ebf6774fe6298103fa6 (patch) | |
| tree | c8563db67c5acb017b0e2f4ab55a86ed3f9a5526 | |
| parent | 88ffb5ee7fb1a0bdfa8d0af9ad5282d7dbff130c (diff) | |
| download | webtrees-5ab17e6894e8a7bc612d3ebf6774fe6298103fa6.tar.gz webtrees-5ab17e6894e8a7bc612d3ebf6774fe6298103fa6.tar.bz2 webtrees-5ab17e6894e8a7bc612d3ebf6774fe6298103fa6.zip | |
#1198630 - 1.5 Statistics Charts - "marriage by country" gives PHP error
| -rw-r--r-- | library/WT/Stats.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/library/WT/Stats.php b/library/WT/Stats.php index f6905214a9..457a9784ef 100644 --- a/library/WT/Stats.php +++ b/library/WT/Stats.php @@ -973,7 +973,6 @@ class WT_Stats { if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $person->getGedcom(), $matches)) { // webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes. foreach ($matches[1] as $country) { - $country=trim($country); if (array_key_exists($country, $country_to_iso3166)) { if (array_key_exists($country_to_iso3166[$country], $surn_countries)) { $surn_countries[$country_to_iso3166[$country]]++; @@ -991,7 +990,7 @@ class WT_Stats { $surn_countries=array(); $b_countries=$this->_statsPlaces('INDI', 'BIRT', 0, true); foreach ($b_countries as $place=>$count) { - $country=$place; + $country = $place; if (array_key_exists($country, $country_to_iso3166)) { if (!isset($surn_countries[$country_to_iso3166[$country]])) { $surn_countries[$country_to_iso3166[$country]]=$count; @@ -1008,7 +1007,7 @@ class WT_Stats { $surn_countries=array(); $d_countries=$this->_statsPlaces('INDI', 'DEAT', 0, true); foreach ($d_countries as $place=>$count) { - $country=$place; + $country = $place; if (array_key_exists($country, $country_to_iso3166)) { if (!isset($surn_countries[$country_to_iso3166[$country]])) { $surn_countries[$country_to_iso3166[$country]]=$count; @@ -1026,11 +1025,13 @@ class WT_Stats { $m_countries=$this->_statsPlaces('FAM'); // webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes. foreach ($m_countries as $place) { - $country=trim($place['country']); - if (!isset($surn_countries[$country_to_iso3166[$country]])) { - $surn_countries[$country_to_iso3166[$country]]=$place['tot']; - } else { - $surn_countries[$country_to_iso3166[$country]]+=$place['tot']; + $country = $place['country']; + if (array_key_exists($country, $country_to_iso3166)) { + if (!isset($surn_countries[$country_to_iso3166[$country]])) { + $surn_countries[$country_to_iso3166[$country]]=$place['tot']; + } else { + $surn_countries[$country_to_iso3166[$country]]+=$place['tot']; + } } } break; @@ -1042,7 +1043,7 @@ class WT_Stats { $a_countries=$this->_statsPlaces('INDI'); // webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes. foreach ($a_countries as $place) { - $country=trim($place['country']); + $country = $place['country']; if (array_key_exists($country, $country_to_iso3166)) { if (!isset($surn_countries[$country_to_iso3166[$country]])) { $surn_countries[$country_to_iso3166[$country]]=$place['tot']; |