diff --git a/config/divisions.php b/config/divisions.php index cd95a362..df20b085 100644 --- a/config/divisions.php +++ b/config/divisions.php @@ -183,8 +183,10 @@ $c=mysql_query("SELECT category FROM projectcategoriesdivisions_link, projectcategories WHERE projectcategoriesdivisions_link.projectcategories_id = projectcategories.id AND projectdivisions_id='$r->id' - AND projectcategoriedivisions_link.year='".$config['FAIRYEAR']."' + AND projectcategoriesdivisions_link.year='".$config['FAIRYEAR']."' + AND projectcategories.year='".$config['FAIRYEAR']."' ORDER BY projectcategories.mingrade"); + echo mysql_error(); if(!$c){ $tempcat=" "; }else{ diff --git a/register_participants_project.php b/register_participants_project.php index 1926fbc1..a5405184 100644 --- a/register_participants_project.php +++ b/register_participants_project.php @@ -198,7 +198,8 @@ function countwords() //###### Feature Specific - filtering divisions by category if($config['filterdivisionbycategory']=="yes"){ - $q=mysql_query("SELECT projectdivisions.* FROM projectdivisions,projectcategoriesdivisions_link WHERE projectdivisions.id=projectdivisions_id AND projectcategories_id=".$projectcategories_id." AND year='".$config['FAIRYEAR']."' ORDER BY division"); + $q=mysql_query("SELECT projectdivisions.* FROM projectdivisions,projectcategoriesdivisions_link WHERE projectdivisions.id=projectdivisions_id AND projectcategories_id=".$projectcategories_id." AND projectdivisions.year='".$config['FAIRYEAR']."' AND projectcategoriesdivisions_link.year='".$config['FAIRYEAR']."' ORDER BY division"); + echo mysql_error(); //### }else $q=mysql_query("SELECT * FROM projectdivisions WHERE year='".$config['FAIRYEAR']."' ORDER BY division");