Index: lib/rsslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/rsslib.php,v
retrieving revision 1.52.2.4
diff -u -r1.52.2.4 rsslib.php
--- lib/rsslib.php	16 Sep 2008 08:55:43 -0000	1.52.2.4
+++ lib/rsslib.php	21 May 2009 17:13:20 -0000
@@ -213,6 +213,15 @@
             if (isset($item->category)) {
                 $result .= rss_full_tag('category',3,false,$item->category);
             }
+            if (isset($item->tags)) {
+                $attributes = array();
+                if (isset($item->tagscheme)) {
+                    $attributes['domain'] = $item->tagscheme;
+                }
+                foreach ($item->tags as $tag) {
+                    $result .= rss_full_tag('category', 3, false, $tag, $attributes);
+                }
+            }
             $result .= rss_full_tag('title',3,false,strip_tags($item->title));
             $result .= rss_full_tag('link',3,false,$item->link);
             $result .= rss_add_enclosures($item);
Index: blog/rsslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/blog/rsslib.php,v
retrieving revision 1.12.2.2
diff -u -r1.12.2.2 rsslib.php
--- blog/rsslib.php	10 Dec 2008 07:09:50 -0000	1.12.2.2
+++ blog/rsslib.php	21 May 2009 17:13:20 -0000
@@ -76,6 +76,12 @@
                 $item->pubdate = $blogpost->lastmodified;
                 $item->link = $CFG->wwwroot.'/blog/index.php?postid='.$blogpost->id;
                 $item->description = format_text($blogpost->summary, $blogpost->format);
+                if ( !empty($CFG->usetags) && ($blogtags = tag_get_tags_array('post', $blogpost->id)) ) {
+                    if ($blogtags) {
+                        $item->tags = $blogtags;
+                    }
+                    $item->tagscheme = $CFG->wwwroot . '/tag';
+                }
                 $items[] = $item;
             }
             $articles = rss_add_items($items);   /// Change structure to XML