Fixed problem with counting number of rows for some SQL queries displayed in db pager.

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 5b8c9c470e3fa78577898fec89c45e9cba2f8d0d..dcb04eceda02d2301f6fbfeb1b507e35348d7f17 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -605,7 +605,7 @@ function void_journal_trans($type, $type_no, $use_transaction=true)
 function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
 {
 
-       $sql = "SELECT  IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
+       $sql = "SELECT  IFNULL(a.gl_seq,0) as gl_seq,
                gl.tran_date,
                gl.type,
                gl.type_no,

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 598d6964273fc5fff937a37e979fe9a27524842b..1940236d0ed64338d6bed92ffc2c130fc33f18af 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -290,7 +290,7 @@ class db_pager {
                if ($count) {
                        $group = $group == '' ? "*" : "DISTINCT $group";
 
-                       return "SELECT COUNT($group) FROM $from $where";
+                       return "SELECT COUNT(0) FROM (SELECT $group FROM $from $where) row_count";
                }
 
                $sql = "$select FROM $from $where";