[php-blog-cvs] serendipity index.php,1.65,1.66

[Tom S. <tom...@us...>]

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

Modified Files:
	index.php 
Log Message:
- This is a cleaner way of doing it
- Use $serendipity['GET']


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- index.php	16 Dec 2004 15:10:35 -0000	1.65
+++ index.php	16 Dec 2004 17:36:31 -0000	1.66
@@ -94,19 +94,15 @@
     /* We must always *assume* that Year, Month and Day are the first 3 arguments */
     list(,$year, $month, $day) = $_args;
 
-    if (isset($serendipity['GET']['page']) && !isset($year, $month, $day)) {
-        $pagination_only = true;
-    }
-
-    $_GET['serendipity']['action']     = 'read';
-    $_GET['serendipity']['hidefooter'] = true;
+    $serendipity['GET']['action']     = 'read';
+    $serendipity['GET']['hidefooter'] = true;
 
     if ( !isset($year) ) {
         $year = date('Y');
         $month = date('m');
         $day = date('j');
-        $_GET['serendipity']['action']     = null;
-        $_GET['serendipity']['hidefooter'] = null;
+        $serendipity['GET']['action']     = null;
+        $serendipity['GET']['hidefooter'] = null;
     }
 
     if ($week) {
@@ -127,7 +123,8 @@
     }
 
     $serendipity['range'] = array($ts, $te);
-    if (!isset($pagination_only)) {
+
+    if ($serendipity['GET']['action'] == 'read') {
         $serendipity['head_subtitle'] = sprintf(ENTRIES_FOR, $date);
     }