[sfiab-commits] [svn] commit: r2717 - in /trunk/admin: reports_acscript.php winners.php

[<in...@sf...>]

Author: james
Date: Fri Apr  8 12:28:21 2011
New Revision: 2717

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

Modified:
    trunk/admin/reports_acscript.php
    trunk/admin/winners.php

Modified: trunk/admin/reports_acscript.php
==============================================================================
--- trunk/admin/reports_acscript.php (original)
+++ trunk/admin/reports_acscript.php Fri Apr  8 12:28:21 2011
@@ -237,17 +237,17 @@
 						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: ";

Modified: trunk/admin/winners.php
==============================================================================
--- trunk/admin/winners.php (original)
+++ trunk/admin/winners.php Fri Apr  8 12:28:21 2011
@@ -450,7 +450,7 @@
 
 function print_award(&$r, $fairs_id, $editor=false, $editor_data=array())
 {
-	global $config, $auth_type;
+	global $config, $auth_type, $conference;
 
 //	echo "fair=$fairs_id";