[php-blog-cvs] serendipity index.php,1.34,1.35 serendipity_functions.inc.php,1.224,1.225

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

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

Modified Files:
	index.php serendipity_functions.inc.php 
Log Message:
Don't allow more than one '?' in the URI for comment redirection. This may help fixing Bug https://sourceforge.net/tracker/?func=detail&atid=542822&aid=914239&group_id=75065


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- index.php	15 Mar 2004 08:09:09 -0000	1.34
+++ index.php	15 Mar 2004 09:10:24 -0000	1.35
@@ -71,7 +71,6 @@
 
     echo $data;
 } else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
-    header('X-CommentSaver: true');
     serendipity_rememberComment();
 
     if (!empty($serendipity['POST']['submit'])) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- serendipity_functions.inc.php	15 Mar 2004 08:09:10 -0000	1.224
+++ serendipity_functions.inc.php	15 Mar 2004 09:10:24 -0000	1.225
@@ -929,7 +929,7 @@
 ?>
             <br />
             <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
-                <?php echo serendipity_displayCommentForm($entry['id'], $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . serendipity_archiveURL($entry['id'], $entry['title'])); ?>
+                <?php echo serendipity_displayCommentForm($entry['id'], $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . str_replace('?', '&', serendipity_archiveURL($entry['id'], $entry['title']))); ?>
 <?php
                     } else {
 ?>