From cb23d603f31afa2e9b9aa54a716e032c99e7b972 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 15 Nov 2007 17:35:04 +0000 Subject: [PATCH] MySQL5 Fix for Report 17 (Emergency Contacts) --- admin/reports_students.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index e5524262..60b4bb7e 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -472,9 +472,10 @@ $report_students_fields = array( } $q = " FROM - students $partner_join, schools, projects $awards_join, projectdivisions, projectcategories, registrations + JOIN students ON students.registrations_id=registrations_id + $partner_join $emergencycontact_join $tour_join WHERE @@ -482,7 +483,6 @@ $report_students_fields = array( AND projects.registrations_id=students.registrations_id AND projectdivisions.id=projects.projectdivisions_id AND projectcategories.id=projects.projectcategories_id - AND registrations.id=students.registrations_id AND (registrations.status='complete' OR registrations.status='paymentpending') AND students.year='$year' AND projects.year='$year'