Merge branch 'wip-MDL-30539-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

blog/lib.php

@@ -479,6 +479,13 @@ function blog_get_options_for_user(stdClass $user=null) {
             );
         }
     }
+    if ($canview && $CFG->enablerssfeeds) {
+        $options['rss'] = array(
+            'string' => get_string('rssfeed', 'blog'),
+            'link' => new moodle_url(rss_get_url($sitecontext->id, $USER->id, 'blog', 'user/'.$user->id))
+       );
+    }
+
     // Cache the options
     $useroptions[$user->id] = $options;
     // Return the options

lang/en/blog.php

@@ -138,6 +138,7 @@ $string['publishtoworld'] = 'Anyone in the world';
 $string['readfirst'] = 'Read this first';
 $string['relatedblogentries'] = 'Related blog entries';
 $string['retrievedfrom'] = 'Retrieved from';
+$string['rssfeed'] = 'Blog RSS feed';
 $string['searchterm'] = 'Search: {$a}';
 $string['settingsupdatederror'] = 'An error has occurred, blog preference setting could not be updated';
 $string['siteblog'] = 'Site blog: {$a}';

lib/navigationlib.php

@@ -1944,8 +1944,12 @@ class global_navigation extends navigation_node {
 
             if (count($options) > 0) {
                 $blogs = $usernode->add(get_string('blogs', 'blog'), null, navigation_node::TYPE_CONTAINER);
-                foreach ($options as $option) {
-                    $blogs->add($option['string'], $option['link']);
+                foreach ($options as $type => $option) {
+                    if ($type == "rss") {
+                        $blogs->add($option['string'], $option['link'], settings_navigation::TYPE_SETTING, null, null, new pix_icon('i/rss', ''));
+                    } else {
+                        $blogs->add($option['string'], $option['link']);
+                    }
                 }
             }
         }