arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Some touch-ups to get prize nomination working properly with the new system

Browse Source
This commit is contained in:
james 2011-04-08 16:28:21 +00:00
parent 36cc0e289c
commit 2811eef8d2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/reports_acscript.php
View File

@ -237,17 +237,17 @@ if(!$scriptformat) $scriptformat="default";
if($scriptformat=="default") if($scriptformat=="default")
$rep->addText( " ($pr->projectnumber) $pr->title"); $rep->addText( " ($pr->projectnumber) $pr->title");
$sq=mysql_query("SELECT students.firstname, $sq=mysql_query("SELECT users.firstname,
students.lastname, users.lastname,
students.pronunciation, users.pronunciation,
students.schools_id, users.schools_id,
schools.school schools.school
FROM FROM
students, users,
schools schools
WHERE WHERE
students.registrations_id='$pr->reg_id' users.registrations_id='$pr->reg_id'
AND students.schools_id=schools.id AND users.schools_id=schools.id
"); ");
$students=" Students: "; $students=" Students: ";

2
admin/winners.php
View File

@ -450,7 +450,7 @@ while($r=mysql_fetch_assoc($q)) {
function print_award(&$r, $fairs_id, $editor=false, $editor_data=array()) function print_award(&$r, $fairs_id, $editor=false, $editor_data=array())
{ {
global $config, $auth_type; global $config, $auth_type, $conference;
// echo "fair=$fairs_id"; // echo "fair=$fairs_id";