From 6ecfb4ab4267bf40318271f85a1ede15904e6daf Mon Sep 17 00:00:00 2001 From: jacob Date: Fri, 26 Mar 2010 17:41:44 +0000 Subject: [PATCH] Fix for bug #457 - Error in generating report that included the sponsor DB ID field --- admin/communication.inc.php | 4 ++-- admin/reports_students.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/communication.inc.php b/admin/communication.inc.php index 40233fa8..3306127d 100644 --- a/admin/communication.inc.php +++ b/admin/communication.inc.php @@ -79,10 +79,10 @@ /* "special_award_sponsors_unconfirmed"=>array("name"=>"Special award sponsors (unconfirmed only)","query"=> - "SELECT DISTINCT(award_sponsors.id), organization, firstname, lastname, award_contacts.email FROM award_sponsors, award_awards, award_contacts WHERE award_awards.award_sponsors_id=award_sponsors.id AND award_contacts.award_sponsors_id=award_sponsors.id AND award_sponsors.confirmed='no' AND award_awards.award_types_id='2' AND award_contacts.year='".$config['FAIRYEAR']."'"), + "SELECT DISTINCT(award_sponsors.id), organization, firstname, lastname, award_contacts.email FROM award_sponsors, award_awards, award_contacts WHERE award_awards.sponsors_id=award_sponsors.id AND award_contacts.award_sponsors_id=award_sponsors.id AND award_sponsors.confirmed='no' AND award_awards.award_types_id='2' AND award_contacts.year='".$config['FAIRYEAR']."'"), "special_award_sponsors_all"=>array("name"=>"Special award sponsors (all)","query"=> - "SELECT DISTINCT(award_sponsors.id), organization, firstname, lastname, award_contacts.email FROM award_sponsors, award_awards, award_contacts WHERE award_awards.award_sponsors_id=award_sponsors.id AND award_contacts.award_sponsors_id=award_sponsors.id AND award_awards.award_types_id='2' AND award_contacts.year='".$config['FAIRYEAR']."'"), + "SELECT DISTINCT(award_sponsors.id), organization, firstname, lastname, award_contacts.email FROM award_sponsors, award_awards, award_contacts WHERE award_awards.sponsors_id=award_sponsors.id AND award_contacts.award_sponsors_id=award_sponsors.id AND award_awards.award_types_id='2' AND award_contacts.year='".$config['FAIRYEAR']."'"), */ "school_principals"=>array("name"=>"School principals","query"=> diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index 13d18286..0aee76df 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -461,8 +461,8 @@ $report_students_fields = array( 'name' => 'Award -- Sponsor DB ID', 'header' => 'Award Sponsor', 'width' => 1.5, - 'table' => 'award_awards.award_sponsors_id', - 'table_sort' => 'award_awards.award_sponsors_id', + 'table' => 'award_awards.sponsors_id', + 'table_sort' => 'award_awards.sponsors_id', 'components' => array('awards')), 'pn_awards' => array(