From e5858a6c1b498977d7d56cb5c5d8f4a6c7df25dd Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Mon, 15 Oct 2007 10:16:51 +0000
Subject: [PATCH] Fix comment rss feed timestap
 (http://board.s9y.org/viewtopic.php?p=64011)

---
 docs/NEWS                     | 2 ++
 include/functions_rss.inc.php | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/NEWS b/docs/NEWS
index 75f7148..621d04d 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version 1.3 ()
 ------------------------------------------------------------------------
 
+    * Fix wrong entry timestamp used in comment feeds (garvinhicking)
+
     * Add experimental DB layer for "SQLRelay" database proxy extension, 
       by Dante Mason
 
diff --git a/include/functions_rss.inc.php b/include/functions_rss.inc.php
index 4ec3a1a..8e5a580 100644
--- a/include/functions_rss.inc.php
+++ b/include/functions_rss.inc.php
@@ -40,9 +40,16 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
     if (is_array($entries)) {
         foreach ($entries as $key => $_entry) {
             $entry = &$entries[$key];
+            
+            if (isset($entry['entrytimestamp'])) {
+                $e_ts = $entry['entrytimestamp'];
+            } else {
+                $e_ts = $entry['timestamp'];
+            }
+
             $entry['feed_id']   = (isset($entry['entryid']) && !empty($entry['entryid']) ? $entry['entryid'] : $entry['id']);
             $entry['feed_guid'] = serendipity_rss_getguid($entry, $options['comments']);
-            $entry['feed_entryLink'] = serendipity_archiveURL($entry['feed_id'], $entry['title'], 'baseURL', true, array('timestamp' => $entry['timestamp']));
+            $entry['feed_entryLink'] = serendipity_archiveURL($entry['feed_id'], $entry['title'], 'baseURL', true, array('timestamp' => $e_ts));
             if ($options['comments'] == true) {
                 // Display username as part of the title for easier feed-readability
                 if ($entry['type'] == 'TRACKBACK' && !empty($entry['ctitle'])) {
-- 
2.39.5