diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-07-06 08:57:56 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-07-06 08:57:56 +0000 |
| commit | 13a8e8e24ced233ed300ec707d1521092d43c7d1 (patch) | |
| tree | 083495c2455e633082fe7536224913294e7c1a02 | |
| parent | 4450a94acb785e872e8c657e903b46f754e52a53 (diff) | |
| download | webtrees-13a8e8e24ced233ed300ec707d1521092d43c7d1.tar.gz webtrees-13a8e8e24ced233ed300ec707d1521092d43c7d1.tar.bz2 webtrees-13a8e8e24ced233ed300ec707d1521092d43c7d1.zip | |
#1196913 - Many research tasks missing in list
| -rw-r--r-- | includes/functions/functions_db.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php index b6d9baec15..fd4ec7b589 100644 --- a/includes/functions/functions_db.php +++ b/includes/functions/functions_db.php @@ -1188,8 +1188,8 @@ function get_calendar_events($jd1, $jd2, $facts='', $ged_id=WT_GED_ID) { $where.=" AND d_file=".$ged_id; // Now fetch these events - $ind_sql="SELECT d_gid, i_gedcom, 'INDI', d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file GROUP BY d_julianday1 ORDER BY d_julianday1"; - $fam_sql="SELECT d_gid, f_gedcom, 'FAM', d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families` {$where} AND d_gid=f_id AND d_file=f_file GROUP BY d_julianday1 ORDER BY d_julianday1"; + $ind_sql="SELECT d_gid, i_gedcom, 'INDI', d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file GROUP BY d_julianday1, d_gid ORDER BY d_julianday1"; + $fam_sql="SELECT d_gid, f_gedcom, 'FAM', d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families` {$where} AND d_gid=f_id AND d_file=f_file GROUP BY d_julianday1, d_gid ORDER BY d_julianday1"; foreach (array($ind_sql, $fam_sql) as $sql) { $rows=WT_DB::prepare($sql)->fetchAll(PDO::FETCH_NUM); foreach ($rows as $row) { |