Fix comment rss feed timestap

(http://board.s9y.org/viewtopic.php?p=64011)

diff --git a/docs/NEWS b/docs/NEWS
index 75f7148e4156d48e122778d72aab54f06ecc7af7..621d04ddd3786137ba1e948e1a2a064727dfc653 100644 (file)
--- 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 4ec3a1afb1d684658e770dda865da1b68443d171..8e5a5809715644145cbc31902a34079b8520c9d6 100644 (file)
--- 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'])) {