diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-12-28 17:47:11 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-12-28 17:47:11 +0000 |
| commit | 775c258f3445e09248299e61a5148cca1e00b39c (patch) | |
| tree | 1c1612892168cdd4ccebcb8433c8045fe4da39b6 /app/Stats.php | |
| parent | c2afc840ffca18d49de6b36d236a5e9f9ab46a47 (diff) | |
| download | webtrees-775c258f3445e09248299e61a5148cca1e00b39c.tar.gz webtrees-775c258f3445e09248299e61a5148cca1e00b39c.tar.bz2 webtrees-775c258f3445e09248299e61a5148cca1e00b39c.zip | |
MySQL 5.7 compatibility
Diffstat (limited to 'app/Stats.php')
| -rw-r--r-- | app/Stats.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/Stats.php b/app/Stats.php index a4fc1a7951..0d201f353d 100644 --- a/app/Stats.php +++ b/app/Stats.php @@ -4637,7 +4637,7 @@ class Stats { " SELECT" . " link1.l_from AS family," . " link1.l_to AS child," . - " child1.d_julianday2 as date," . + " child1.d_julianday2 AS date," . " child1.d_month as d_month" . $sql_sex1 . " FROM `##link` AS link1" . @@ -4648,12 +4648,11 @@ class Stats { " link1.l_type = 'CHIL' AND" . " child1.d_gid = link1.l_to AND" . " child1.d_fact = 'BIRT' AND" . - " d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND" . - " child1.d_month <> ''" . + " child1.d_month IN ('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC')" . $sql_years . " ORDER BY date" . " ) AS children" . - " GROUP BY family" . + " GROUP BY family, d_month{$sql_sex1}" . ") AS first_child " . "GROUP BY d_month"; if ($sex) { |