[php-blog-cvs] serendipity serendipity_functions.inc.php,1.319,1.320

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
change other occurences of archives links to '+' as well, to remain
compatible with auto-trackbacks.
Old-style URLs stay valid if used as link, of course.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- serendipity_functions.inc.php	6 Jul 2004 00:16:26 -0000	1.319
+++ serendipity_functions.inc.php	6 Jul 2004 07:43:59 -0000	1.320
@@ -1201,7 +1201,7 @@
                          rdf:about="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/ei_<?php echo $entry['id']; ?>.rdf"
                          trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&amp;entry_id=<?php echo $entry['id']; ?>"
                          dc:title="<?php echo htmlspecialchars($entry['title']); ?>"
-                         dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title']); ?>" />
+                         dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); ?>" />
                 </rdf:RDF>
                 -->
         <?php
@@ -1481,9 +1481,9 @@
 ?>
 
             </div>
-            <?php 
+            <?php
                 if ( $comment['id'] ) {
-                    serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.'); 
+                    serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.');
                 }
             ?>
         </div>
@@ -1612,7 +1612,7 @@
 function serendipity_mailSubscribers($entry_id, $poster, $posterMail, $title, $fromEmail = 'no...@ex...') {
     global $serendipity;
 
-    $entryURI = serendipity_archiveURL($entry_id, $title);
+    $entryURI = serendipity_archiveURL($entry_id, $title, 'baseURL', false);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
     $pgsql_insert = '';
@@ -1681,7 +1681,7 @@
         $fromName = ANONYMOUS;
     }
 
-    $entryURI = serendipity_archiveURL($id, $title);
+    $entryURI = serendipity_archiveURL($id, $title, 'baseURL', false);
 
     if ($type == 'TRACKBACK') {
         $subject =  '[' . $serendipity['blogTitle'] . '] ' . NEW_TRACKBACK_TO . ' ' . $title;
@@ -2262,7 +2262,7 @@
     array_shift($matches);
 
     // Make trackback URL
-    $url = serendipity_archiveURL($id, $title);
+    $url = serendipity_archiveURL($id, $title, 'baseURL', false);
 
     // Add URL references
     $locations = $matches[0];