[php-blog-cvs] serendipity serendipity_functions.inc.php,1.359,1.360

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fix comment form for rewrite-none


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -d -r1.359 -r1.360
--- serendipity_functions.inc.php	23 Jul 2004 00:22:52 -0000	1.359
+++ serendipity_functions.inc.php	23 Jul 2004 09:54:41 -0000	1.360
@@ -1307,8 +1307,7 @@
             <a id="trackbacks"></a>
              <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?>
                 (<a style="font-weight: normal" href="<?php echo $tbu; ?>" onClick="alert('<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>'); return false;" title="<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>"><?php echo TRACKBACK_SPECIFIC; ?></a>)</div>
-<?php
-
+?>
                     serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id']));
 ?>
             </div>
@@ -1359,8 +1358,23 @@
 ?>
             <br />
             <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
-            <?php echo serendipity_displayCommentForm($entry['id'], $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . str_replace('?', '&', serendipity_archiveURL($entry['id'], $entry['title'])), true, $serendipity['POST'], true, serendipity_db_bool($entry['moderate_comments'])); ?>
 <?php
+                        $comm_url = serendipity_archiveURL(
+                                      $entry['id'],
+                                      $entry['title'],
+                                      'baseURL',
+                                      true,
+                                      false
+                        );
+
+                        echo serendipity_displayCommentForm(
+                               $entry['id'],
+                               $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url,
+                               true,
+                               $serendipity['POST'],
+                               true,
+                               serendipity_db_bool($entry['moderate_comments'])
+                        );
                     }
 ?>
             </div>
@@ -2404,10 +2418,10 @@
 /**
  * return a fully qualified URL
  */
-function serendipity_archiveURL($id, $title, $key = 'baseURL', $compat = true) {
+function serendipity_archiveURL($id, $title, $key = 'baseURL', $compat = true, $checkrewrite = true) {
 global $serendipity;
 
-    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title, $compat) . '.html';
+    return $serendipity[$key] . ($checkrewrite && $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title, $compat) . '.html';
 }
 
 /**