From 5147b3a62bea5415264b59d6fa30b7f74bf6062b Mon Sep 17 00:00:00 2001
From: james <james>
Date: Sun, 20 Mar 2011 19:20:03 +0000
Subject: [PATCH] Fix daves commit from last night, we dont use year anymore,
 we use conferences_id

---
 admin/registration_receivedforms.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/admin/registration_receivedforms.php b/admin/registration_receivedforms.php
index 39f44aa7..c3513794 100644
--- a/admin/registration_receivedforms.php
+++ b/admin/registration_receivedforms.php
@@ -77,14 +77,10 @@ $showformatbottom=true;
 							projects,projectcategories,projectdivisions
 						WHERE
 							projects.registrations_id='$reg_id'
-							AND
-							projects.projectcategories_id=projectcategories.id
-							AND
-							projects.projectdivisions_id=projectdivisions.id
-							AND 
-							projectcategories.year=projects.year
-							AND
-							projectdivisions.year=projects.year
+							AND projects.projectcategories_id=projectcategories.id
+							AND projects.projectdivisions_id=projectdivisions.id
+							AND projectcategories.conferences_id=projects.conferences_id
+							AND projectdivisions.conferences_id=projects.conferences_id
 						");
 
 echo mysql_Error();