Index: trunk/globals.php
===================================================================
diff -u -r563 -r568
--- trunk/globals.php	(.../globals.php)	(revision 563)
+++ trunk/globals.php	(.../globals.php)	(revision 568)
@@ -201,17 +201,12 @@
 
 Function QueryCount($sql)
 {
-  $countsql = "SELECT count(*) as TableCount ".substr($sql,strpos($sql," FROM "));
-  if(strpos($countsql,"LIMIT"))
-    $countsql = substr($countsql,0,strpos($countsql,"LIMIT"));
-  if(strpos($countsql,"ORDER BY"))
-    $countsql = substr($countsql,0,strpos($countsql,"ORDER BY"));
-    
-  $db = &GetADODBConnection();
-  $rs = $db->Execute($countsql);
-  //echo $countsql."<br>\n";
-  $res = $rs->fields["TableCount"];
-  return $res;  
+	$sql = preg_replace('/SELECT(.*)FROM[ \n\r](.*)/is','SELECT COUNT(*) AS TableCount FROM $2', $sql);
+	$sql = preg_replace('/(.*)LIMIT(.*)/is','$1', $sql);
+	$sql = preg_replace('/(.*)ORDER BY(.*)/is','$1', $sql);
+	
+  	$db =& GetADODBConnection();
+  	return $db->GetOne($sql);
 }
     
 function GetPageCount($ItemsPerPage,$NumItems)