--- branches/paul/admin/subject_builder.phtml	2004/03/18 19:58:18	68
+++ branches/paul_xx/admin/subject_builder.phtml	2004/03/18 20:01:09	69
@@ -111,8 +111,8 @@
 		subject_id = "
 		. $subject_id;
 		
-	$rs = mysql_tryquery($sql);
-	$row = mysql_fetch_array ($rs, MYSQL_ASSOC);	
+	$rs = xx_tryquery($sql);
+	$row = xx_fetch_array ($rs, xx_ASSOC);	
 	$rqs_date_modified = $row["rqs_date_modified"];
 	$rqs_date_created = $row["rqs_date_created"];
 	$rqs_account_created = $row["rqs_account_created"];
@@ -311,15 +311,15 @@
 			rsi.infotype_id = i.infotype_id
 			ORDER BY mi.masterinfotype, i.infotype";
 
-	$rs = mysql_tryquery($sql);
+	$rs = xx_tryquery($sql);
 
-	$rows = mysql_num_rows($rs);
+	$rows = xx_num_rows($rs);
 
 	// initialize
 	$last_masterinfotype_id = 0;
 
 	$rowcount = 0;
-	while ($row = mysql_fetch_array ($rs, MYSQL_ASSOC)) {
+	while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 		// Fetch information types for this subject
 		$infotype_id = $row["infotype_id"];
@@ -379,11 +379,11 @@
 		rsi.resource_id = r.resource_id
 		ORDER BY m.masterinfotype, i.infotype, r.title";
 
-	$rs = mysql_tryquery($sql);
+	$rs = xx_tryquery($sql);
 
 	// printf("sql was: %s<BR><BR>", $sql);
 
-	while ($row = mysql_fetch_array ($rs, MYSQL_ASSOC)) {
+	while ($row = xx_fetch_array ($rs, xx_ASSOC)) {
 
 		// Fetch information types for this subject
 		$description = $row["description"];