[php-blog-cvs] serendipity/include functions_entries.inc.php,1.1.2.7,1.1.2.8 genpage.inc.php,1.1.2.2,1.1.2.3

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

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

Modified Files:
      Tag: branch-smarty
	functions_entries.inc.php genpage.inc.php 
Log Message:
New configuration variable to set amount of entries per page


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- functions_entries.inc.php	15 Nov 2004 09:41:48 -0000	1.1.2.7
+++ functions_entries.inc.php	15 Nov 2004 10:21:48 -0000	1.1.2.8
@@ -476,7 +476,7 @@
         }
 
         $totalEntries = serendipity_getTotalEntries();
-        $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
+        $totalPages   = ceil($totalEntries / $serendipity['fetchLimit']);
 
         if (!isset($serendipity['GET']['page'])) {
             $serendipity['GET']['page'] = 1;
@@ -632,7 +632,7 @@
 
     if (!isset($serendipity['GET']['id']) &&
             (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) &&
-            (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
+            (count($entries) <= $serendipity['fetchLimit'])) {
         serendipity_printEntryFooter();
     } else {
         serendipity_printEntryFooter(true);

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/genpage.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- genpage.inc.php	12 Nov 2004 16:27:44 -0000	1.1.2.2
+++ genpage.inc.php	15 Nov 2004 10:22:03 -0000	1.1.2.3
@@ -29,7 +29,7 @@
             if (isset($serendipity['GET']['id'])) {
                 serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
             } else {
-                serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, 15));
+                serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, $serendipity['fetchLimit']));
             }
             break;
 
@@ -57,7 +57,7 @@
 
         // Welcome screen or whatever
         default:
-            serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
+            serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit']));
             break;
     }