[php-blog-cvs] serendipity serendipity_functions.inc.php,1.401,1.402 serendipity_admin_entries.inc.php,1.34,1.35

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_entries.inc.php 
Log Message:
fix bug #1013174 - when previewing entry, the pagination footer should not be shown


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- serendipity_functions.inc.php	21 Aug 2004 12:38:20 -0000	1.401
+++ serendipity_functions.inc.php	21 Aug 2004 13:01:27 -0000	1.402
@@ -1386,7 +1386,7 @@
         } // end for-loop (dates)
 
         if (!isset($serendipity['GET']['id']) &&
-               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
+               (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) &&
                (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
             serendipity_printEntryFooter();
         } else {

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin_entries.inc.php	3 Aug 2004 18:04:35 -0000	1.34
+++ serendipity_admin_entries.inc.php	21 Aug 2004 13:01:27 -0000	1.35
@@ -28,7 +28,7 @@
     $perPage = (!empty($serendipity['GET']['sort']['perPage']) ? $serendipity['GET']['sort']['perPage'] : $per_page[0]);
     $page    = (int)$serendipity['GET']['page'];
     $offSet  = $perPage*$page;
-    
+
     if (empty($serendipity['GET']['sort']['ordermode'])) {
         $serendipity['GET']['sort']['ordermode'] = 'DESC';
     }
@@ -206,7 +206,7 @@
                         </td>
                         <td align="right">
                             [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo EDIT ?></a>]
-                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>] 
+                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>]
                         </td>
                     </tr>
                 </table>
@@ -297,6 +297,7 @@
             }
         } else {
             // Only display the preview
+            $serendipity['hidefooter'] = true;
             if (!is_numeric($entry['timestamp'])) $entry['timestamp']  = time();
             if (!isset($entry['trackbacks']) || !$entry['trackbacks']) $entry['trackbacks'] = 0;
             if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;