diff --git a/admin/reports_acscript.php b/admin/reports_acscript.php index 41754c9..c4bdb56 100644 --- a/admin/reports_acscript.php +++ b/admin/reports_acscript.php @@ -237,17 +237,17 @@ if(!$scriptformat) $scriptformat="default"; if($scriptformat=="default") $rep->addText( " ($pr->projectnumber) $pr->title"); - $sq=mysql_query("SELECT students.firstname, - students.lastname, - students.pronunciation, - students.schools_id, + $sq=mysql_query("SELECT users.firstname, + users.lastname, + users.pronunciation, + users.schools_id, schools.school FROM - students, + users, schools WHERE - students.registrations_id='$pr->reg_id' - AND students.schools_id=schools.id + users.registrations_id='$pr->reg_id' + AND users.schools_id=schools.id "); $students=" Students: "; diff --git a/admin/winners.php b/admin/winners.php index a6720cc..31f1406 100644 --- a/admin/winners.php +++ b/admin/winners.php @@ -450,7 +450,7 @@ while($r=mysql_fetch_assoc($q)) { function print_award(&$r, $fairs_id, $editor=false, $editor_data=array()) { - global $config, $auth_type; + global $config, $auth_type, $conference; // echo "fair=$fairs_id";