X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=522b04b6873eb1aa9da1ca2258fa8c053c6d8574;hb=561f438a3a1f7b5753d2b09238871418710e687f;hp=c2ae04b6ecbd15b474981232b1fee77c8dfdfc39;hpb=e3004d8581b1ea3c02bfe2b1e880990309c4459e;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index c2ae04b6..522b04b6 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -287,11 +287,8 @@ class db_pager {
 		}
 		if ($where) $where = " WHERE ($where)";
 
-		if ($count) {
-			$group = $group == '' ? "*" : "DISTINCT $group";
-
-			return "SELECT COUNT(*) FROM (SELECT $group FROM $from $where) tmp_count";
-		}
+		if ($count)
+			return "SELECT COUNT(*) FROM ($this->sql) tmp_count";
 
 		$sql = "$select FROM $from $where";
 		if ($group) $sql.= " GROUP BY $group";
@@ -303,8 +300,8 @@ class db_pager {
 					if(isset($col['ord_priority'])) {
 						$columns[$col['ord_priority']] = $col;
 					}
-			}
-			krsort($columns);
+		}
+		krsort($columns);
 
 	    foreach ($columns as $col) {
 	       	if (isset($col['ord'])) {
@@ -313,7 +310,7 @@ class db_pager {
 			    }
 			}
 	    }
-				
+
 	    if (count($ord)) {
 			$ord = array_map(function_exists('mysql_real_escape_string') ? 
 				'mysql_real_escape_string': 'mysql_escape_string', $ord);