--- loncom/interface/lonrss.pm	2006/05/18 22:30:11	1.23
+++ loncom/interface/lonrss.pm	2006/08/11 20:11:47	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.23 2006/05/18 22:30:11 albertel Exp $
+# $Id: lonrss.pm,v 1.27 2006/08/11 20:11:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,8 +93,7 @@ sub advertisefeeds {
 	$mode='adm';
     }
     foreach my $feed (sort(keys(%feednames))) {
-	if ($feed ne '' 
-	    && ($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
+	if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
 	    my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
 	    my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
 	    if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
@@ -140,7 +139,8 @@ sub editentry {
     }
     my $feedname=&feedname($filename);
     &Apache::lonnet::put('nohist_all_rss_feeds',
-			 { &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) },
+			 { &filterfeedname($filename) => 
+			       (&displayfeedname($filename,$uname,$udom))[0] },
 			 $udom,$uname);
     return &Apache::lonnet::put($feedname,{
 	$id.'_title' => $title,
@@ -200,12 +200,12 @@ sub add_blog_entry_link {
     my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;
     return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.
 	&escape($id).
-	'&title='.&escape($title).
-	'&description='.&escape($description).
-	'&url='.&escape($url).
-	'&status='.&escape($status).
-	'&encurl='.&escape($encurl).
-	'&enctype='.&escape($enctype).
+	'&amp;title='.&escape($title).
+	'&amp;description='.&escape($description).
+	'&amp;url='.&escape($url).
+	'&amp;status='.&escape($status).
+	'&amp;encurl='.&escape($encurl).
+	'&amp;enctype='.&escape($enctype).
 	"'>".$linktext.'</a>';
 
 }
@@ -241,7 +241,9 @@ sub handler {
     my $feedname=&feedname($filename);
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     if ($html) {
-	$r->print(&Apache::loncommon::start_page(($displayfeedname?$displayfeedname:&mt("Available RSS Feeds and Blogs")),undef,
+	my $title = $displayfeedname?$displayfeedname
+                                    :"Available RSS Feeds and Blogs";
+	$r->print(&Apache::loncommon::start_page($title,undef,
 						 {'domain'         => $udom,
 						  'force_register' =>
 						      $env{'form.register'}}).