Version 4.7.13

This commit is contained in:
Neo committed 2025-12-19 16:14:56 -08:00
1 parent fd22d99e69
commit 7124a02564
954 files changed
+29277 -59308

No files matched your search

+4 -2
View File
@@ -316,7 +316,7 @@ class _Db extends Table
}
/* Count results (for pagination) */
$count = $this->db->select( 'count(*)', $this->table, $where );
$count = $this->db->select( 'count(*)', $this->table, $where, NULL, NULL, $this->groupBy );
if ( \count( $this->joins ) )
{
foreach( $this->joins as $join )
@@ -324,7 +324,9 @@ class _Db extends Table
$count->join( $join['from'], ( isset( $join['where'] ) ? $join['where'] : null ), ( isset( $join['type'] ) ) ? $join['type'] : 'LEFT' );
}
}
$count = $count->first();
$count = $this->groupBy ? $count->count() : $count->first();
$selectPrefix = ( $this->groupBy ) ? '' : $this->table . '.*, ';
/* Now get column headers */