--- loncom/interface/lonrss.pm	2010/01/03 21:21:25	1.47.8.1
+++ loncom/interface/lonrss.pm	2012/07/03 15:18:54	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.47.8.1 2010/01/03 21:21:25 raeburn Exp $
+# $Id: lonrss.pm,v 1.50 2012/07/03 15:18:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,10 +60,10 @@ sub displayfeedname {
 # no, construct a name
     my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {
+        $name=&mt('Course Blog');
         if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
             $name = &mt('Community Blog'); 
         }
-        $name=&mt('Course Blog');
 	if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
 	    $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
 	}
@@ -261,9 +261,11 @@ sub blocking_blogdisplay {
         if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
             if ($html) {
-                $output .= '<br />'.
-                       &Apache::loncommon::build_block_table($startblock,
-                                                        $endblock,\%setters);
+                #$output .= '<br />'.
+                       #&Apache::loncommon::build_block_table($startblock,
+                       #                                 $endblock,\%setters);
+                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
+                 $output .= '<br /><br />'.$blocktext;
             }
         } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
@@ -286,7 +288,9 @@ sub handler {
 	$edit=1;
 	$html=1;
     }
-    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
+        && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
+            $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
 	$edit=1;
 	$html=1;
     }