[php-blog-cvs] serendipity NEWS,1.214.2.8,1.214.2.9 serendipity_functions.inc.php,1.419.2.17,1.419.2.18

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.17
retrieving revision 1.419.2.18
diff -u -d -r1.419.2.17 -r1.419.2.18
--- serendipity_functions.inc.php	16 Sep 2004 12:18:08 -0000	1.419.2.17
+++ serendipity_functions.inc.php	16 Sep 2004 13:54:03 -0000	1.419.2.18
@@ -1052,10 +1052,20 @@
             }
         }
 
-        $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']}";
+        }
 
-        $totalEntries = $query[0][0];
+        $query = serendipity_db_query($querystring);
+
+        if (is_array($query) && isset($query[0])) {
+            $totalEntries = $query[0][0];
+        } else {
+            $totalEntries = 0;
+        }
         $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
 
         if (!isset($serendipity['GET']['page'])) {

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.8
retrieving revision 1.214.2.9
diff -u -d -r1.214.2.8 -r1.214.2.9
--- NEWS	15 Sep 2004 17:10:12 -0000	1.214.2.8
+++ NEWS	16 Sep 2004 13:54:02 -0000	1.214.2.9
@@ -8,15 +8,25 @@
 
     * Added support for SMARTY templating. (garvinhicking, tomsommer)
 
-Version 0.7 ()
+Version 0.7-beta3 (September 16h, 2004)
 ------------------------------------------------------------------------
 
+    * Fixed footer printing wrong amount of entries when entry was
+      assigned to more than one category. Thanks to Kris/weigon for
+      helping. (garvinhicking)
+
+    * Use htmlspecialchars/strip_tags for escaping user input on comment
+      moderation/viewing. (garvinhicking)
+
     * Fixed warning message from emoticon plugin when emoticons.inc.php
       does not exist (garvinhicking)
 
     * Fixed entries pagination for special cases where quickump calendar
       was displayed on the left sidebar (garvinhicking)
 
+Version 0.7-beta2 (September 15th, 2004)
+------------------------------------------------------------------------
+
     * Added Italian translations, thanks to Alessandro Pellizzari
 
     * Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock)
@@ -43,6 +53,9 @@
     * Fix several postgreSQL update errors. Thanks to daFool from the
       forums! (garvinhicking)
 
+Version 0.7-beta1 (September 6th, 2004)
+------------------------------------------------------------------------
+
     * Disable the use of popups by default (tomsommer)
 
     * BBCode plugin can now pretty print code/php style blocks.