[php-blog-cvs] serendipity serendipity_functions.inc.php,1.440,1.441

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18870

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed entry count and category association bugs using SQLite


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -d -r1.440 -r1.441
--- serendipity_functions.inc.php	7 Oct 2004 10:40:26 -0000	1.440
+++ serendipity_functions.inc.php	13 Oct 2004 09:24:45 -0000	1.441
@@ -592,7 +592,7 @@
                          c.category_icon,
                          c.parentid
                     FROM {$serendipity['dbPrefix']}category AS c
-               LEFT JOIN {$serendipity['dbPrefix']}entrycat AS ec
+                    JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
                    WHERE ec.entryid = {$entryid}";
 
@@ -1107,7 +1107,7 @@
 
         // 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)";
+            $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']} GROUP BY e.id";
         } else {
             $querystring  = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
         }
@@ -1115,7 +1115,11 @@
         $query = serendipity_db_query($querystring);
 
         if (is_array($query) && isset($query[0])) {
-            $totalEntries = $query[0][0];
+            if (strtolower($serendipity['dbType']) == 'sqlite') {
+                $totalEntries = count($query);
+            } else {
+                $totalEntries = $query[0][0];
+            }
         } else {
             $totalEntries = 0;
         }