[Tikiwiki-cvs] tiki tiki-g-admin_activities.php,1.10.2.5,1.10.2.6

[<geo...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22336

Modified Files:
      Tag: BRANCH-1-9
	tiki-g-admin_activities.php 
Log Message:
Fixes for MySQL 4.0.x

Index: tiki-g-admin_activities.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-g-admin_activities.php,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -d -r1.10.2.5 -r1.10.2.6
--- tiki-g-admin_activities.php	26 Jan 2006 17:42:50 -0000	1.10.2.5
+++ tiki-g-admin_activities.php	8 Mar 2006 11:44:02 -0000	1.10.2.6
@@ -251,11 +251,10 @@
 	}
 
 	if ($_REQUEST['filter_role']) {
-		$wheres[] = " activityId IN (SELECT activityId FROM " . GALAXIA_TABLE_PREFIX . 
-			"activity_roles WHERE roleId=" . $_REQUEST['filter_role'] . ")";
+		$wheres[] = " ga.activityId = gar.activityId AND gar.roleId=" . $_REQUEST['filter_role'];
 	}
 
-	$where = implode('and', $wheres);
+	$where = implode('AND', $wheres);
 }
 
 if (!isset($_REQUEST['sort_mode']))