Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3673
Modified Files:
serendipity_functions.inc.php
Log Message:
correctly count entries
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- serendipity_functions.inc.php 16 Sep 2004 10:29:08 -0000 1.426
+++ serendipity_functions.inc.php 16 Sep 2004 13:52:49 -0000 1.427
@@ -1094,10 +1094,21 @@
}
}
- $querystring = "SELECT count(e.id) {$serendipity['fullCountQuery']}"; // The unique query condition was built previously in serendipity_fetchEntries()
- $query = serendipity_db_query($querystring);
+ // The unique query condition was built previously in serendipity_fetchEntries()
+ if (strtolower($serendipity['dbType']) == 'sqlite') {
+ $querystring = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY count(e.id)";
+ } else {
+ $querystring = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
+ }
+
+ $query = serendipity_db_query($querystring);
+
+ if (is_array($query) && isset($query[0])) {
+ $totalEntries = $query[0][0];
+ } else {
+ $totalEntries = 0;
+ }
- $totalEntries = $query[0][0];
$totalPages = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
if (!isset($serendipity['GET']['page'])) {
|
