[php-blog-cvs] serendipity serendipity_functions.inc.php,1.327,1.328

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
count the entries the right way if no category is specified, because
postings to multple categories were counted once per category.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- serendipity_functions.inc.php	13 Jul 2004 14:15:17 -0000	1.327
+++ serendipity_functions.inc.php	13 Jul 2004 15:41:08 -0000	1.328
@@ -1063,23 +1063,28 @@
             }
         }
 
-        $querystring  = "SELECT count(id)
-                           FROM {$serendipity['dbPrefix']}entries e,
-                             {$serendipity['dbPrefix']}entrycat ec,
-                             {$serendipity['dbPrefix']}category c
-                           WHERE e.isdraft = 'false'
-                             AND e.id = ec.entryid AND ec.categoryid = c.categoryid ";
         if (isset($serendipity['GET']['category'])) {
             $_categoryid = explode('_', $serendipity['GET']['category']);
             $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
             if (is_numeric($categoryid)) {
-                $querystring .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
+                $querystring  = "SELECT count(e.id)
+                                   FROM {$serendipity['dbPrefix']}entries e,
+                                     {$serendipity['dbPrefix']}entrycat ec,
+                                     {$serendipity['dbPrefix']}category c
+                                   WHERE e.isdraft = 'false'
+                                     AND e.id = ec.entryid AND ec.categoryid = c.categoryid
+                                     AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
             }
         }
 
-        $query        = serendipity_db_query($querystring);
+        if (empty($querystring)) {
+            $querystring  = "SELECT count(e.id)
+                               FROM {$serendipity['dbPrefix']}entries e
+                               WHERE e.isdraft = 'false'";
+        }
 
+        $query        = serendipity_db_query($querystring);
         $totalEntries = $query[0][0];
         $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));