[php-blog-cvs] serendipity serendipity_functions.inc.php,1.209,1.210

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Remove appending ? char from calendar links, when it is not needed


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- serendipity_functions.inc.php	15 Feb 2004 19:33:38 -0000	1.209
+++ serendipity_functions.inc.php	16 Feb 2004 19:32:11 -0000	1.210
@@ -335,7 +335,7 @@
 
         if (is_numeric($categoryid)) {
             $querystring .= " AND categoryid = $categoryid";
-            $base_query   = 'serendipity[category]=' . $categoryid;
+            $base_query   = '?serendipity[category]=' . $categoryid;
             $add_query    = '&' . $base_query;
         }
     }
@@ -349,7 +349,7 @@
     }
     $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month)));
     // Prepare the table
-    $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $year . sprintf('%02d', $month) . '.html?' . $base_query;
+    $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $year . sprintf('%02d', $month) . '.html' . $base_query;
 ?>
 <table width="100%" class="serendipity_calendar" cellspacing="1">
     <tr>
@@ -426,7 +426,7 @@
                 }
 
                 // Print day
-                $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html?' . $base_query;
+                $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query;
 
                 if (date('m')    == $month
                     && date('Y') == $year