Part of bug #3463481: add guid to items

diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php
index 6b489d551a8be06ea2bf858cd8b6552ef4019a9f..fd5bdbf34bc774f8428ff9ee2f7a0a3487e85691 100644 (file)
--- a/data/templates/default/rss.tpl.php
+++ b/data/templates/default/rss.tpl.php
@@ -17,6 +17,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
     <item>
         <title><?php echo htmlspecialchars($bookmark['title']); ?></title>
         <link><?php echo htmlspecialchars($bookmark['link']); ?></link>
+        <guid><?php echo $bookmark['guid']; ?></guid>
         <description><?php echo htmlspecialchars($bookmark['description']); ?></description>
         <dc:creator><?php echo htmlspecialchars($bookmark['creator']); ?></dc:creator>
         <pubDate><?php echo $bookmark['pubdate']; ?></pubDate>

diff --git a/www/rss.php b/www/rss.php
index 46c0ffd6b9de016f48084d20c636237246503f6f..3628a2e5ba823a33ee4ad5025e7865d5966fdfef 100644 (file)
--- a/www/rss.php
+++ b/www/rss.php
@@ -137,6 +137,7 @@ $bookmarks_tmp = filter($bookmarks['bookmarks']);
 
 $bookmarks_tpl = array();
 $latestdate    = null;
+$guidBaseUrl   = addProtocolToUrl(ROOT) . '#';
 foreach ($bookmarks_tmp as $key => $row) {
     $_link = $row['bAddress'];
     // Redirection option
@@ -154,7 +155,8 @@ foreach ($bookmarks_tmp as $key => $row) {
         'description' => $row['bDescription'],
         'creator'     => SemanticScuttle_Model_UserArray::getName($row),
         'pubdate'     => $_pubdate,
-        'tags'        => $row['tags']
+        'tags'        => $row['tags'],
+        'guid'        => $guidBaseUrl . $row['bId'],
     );
 }
 unset($bookmarks_tmp);