From: brockhaus <brockhaus>
Date: Mon, 17 Mar 2008 18:54:03 +0000 (+0000)
Subject: Add feed_guid only, if not set externaly prior
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=bc2580377ce3dd6065e419afcc041a36b8b0a60a;p=s9y.git

Add feed_guid only, if not set externaly prior
---

diff --git a/include/functions_rss.inc.php b/include/functions_rss.inc.php
index 8e5a580..0f1acfd 100644
--- a/include/functions_rss.inc.php
+++ b/include/functions_rss.inc.php
@@ -48,7 +48,11 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
             }
 
             $entry['feed_id']   = (isset($entry['entryid']) && !empty($entry['entryid']) ? $entry['entryid'] : $entry['id']);
-            $entry['feed_guid'] = serendipity_rss_getguid($entry, $options['comments']);
+
+            // set feed guid only, if not already defined externaly
+            if (empty($entry['feed_guid']))
+                $entry['feed_guid'] = serendipity_rss_getguid($entry, $options['comments']);
+
             $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