[php-blog-cvs] serendipity NEWS,1.235,1.236 serendipity_functions.inc.php,1.437,1.438

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -d -r1.437 -r1.438
--- serendipity_functions.inc.php	3 Oct 2004 21:16:23 -0000	1.437
+++ serendipity_functions.inc.php	6 Oct 2004 09:53:46 -0000	1.438
@@ -2021,8 +2021,9 @@
 
     if (is_array($entries)) {
         foreach ($entries as $entry) {
+            $id   = (isset($entry['entryid']) && !empty($entry['entryid']) ? $entry['entryid'] : $entry['id']);
             $guid = serendipity_rss_getguid($entry, $comments);
-            $entryLink = serendipity_archiveURL($entry['id'], $entry['title']);
+            $entryLink = serendipity_archiveURL($id, $entry['title']);
             if ($comments == true) {
                 // Display username as part of the title for easier feed-readability
                 $entry['title'] = $entry['username'] . ': ' . $entry['title'];
@@ -2066,13 +2067,13 @@
     <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
     <created><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
     <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified>
-    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
 
 <?php
                     if ($comments === false) {
 ?>
     <slash:comments><?php echo $entry['comments']; ?></slash:comments>
-    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss>
+    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo $id; ?></wfw:commentRss>
 <?php
                     }
 ?>
@@ -2104,12 +2105,12 @@
                     }
 ?>
     <comments><?php echo $entryLink; ?>#comments</comments>
-    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
 <?php
                     if ($comments === false) {
 ?>
     <slash:comments><?php echo $entry['comments']; ?></slash:comments>
-    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss>
+    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo $id; ?></wfw:commentRss>
 <?php
                     }
 ?>
@@ -2163,12 +2164,12 @@
     <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
     <dc:subject><?php echo serendipity_utf8_encode(htmlspecialchars(implode(', ', $categories))); ?></dc:subject>
     <dc:date><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></dc:date>
-    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
 <?php
                     if ($comments === false) {
 ?>
     <slash:comments><?php echo $entry['comments']; ?></slash:comments>
-    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:commentRss>
+    <wfw:commentRss><?php echo $serendipity['baseURL']; ?>rss.php?version=<?php echo $version; ?>&amp;type=comments&amp;cid=<?php echo $id; ?></wfw:commentRss>
 <?php
                     }
 ?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- NEWS	27 Sep 2004 10:24:26 -0000	1.235
+++ NEWS	6 Oct 2004 09:53:45 -0000	1.236
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed wrong entry id displayed in RSS comment feed. Thanks to
+      romulus! (garvinhicking)
+
     * Fixed file permission checks when removing images inside media
       manager. Thanks to Thomas from the forums! (garvinhicking)