[php-blog-cvs] serendipity serendipity_functions.inc.php,1.314,1.315

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed broken entries counting when browsing a category


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- serendipity_functions.inc.php	5 Jul 2004 09:59:55 -0000	1.314
+++ serendipity_functions.inc.php	5 Jul 2004 12:57:16 -0000	1.315
@@ -410,7 +410,7 @@
                                AND e.isdraft     = 'false'
                                AND e.id          = ec.entryid
                                AND c.categoryid  = ec.categoryid
-                               AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid)) . ")";
+                               AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
         }
     }
 
@@ -1031,19 +1031,22 @@
 
     $querystring  = "SELECT count(id)
                        FROM {$serendipity['dbPrefix']}entries e,
-                         {$serendipity['dbPrefix']}entrycat ec
-                       WHERE isdraft = 'false'
-                         AND e.id = ec.entryid";
+                         {$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 .= " e.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
+            $querystring .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
         }
     }
 
     $query        = serendipity_db_query($querystring);
+    echo '<!-- querystring: ' . $querystring . ' ' . print_r($query, true) . ' -->';
+
     $totalEntries = $query[0][0];
     $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));