--- loncom/interface/lonhtmlcommon.pm	2009/08/23 04:02:47	1.234
+++ loncom/interface/lonhtmlcommon.pm	2009/10/30 05:10:03	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.234 2009/08/23 04:02:47 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.236 2009/10/30 05:10:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1590,6 +1590,10 @@ ENDTWO
 
 sub role_select_row {
     my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
+    my $crstype = 'Course';
+    if ($cdom ne '' && $cnum ne '') {
+        $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
+    }
     my $output;
     if (defined($title)) {
         $output = &row_title($title,$css_class);
@@ -1614,7 +1618,7 @@ sub role_select_row {
                 $plrole = &mt('Custom Role');
             }
         } else {
-            $plrole=&Apache::lonnet::plaintext($role);
+            $plrole=&Apache::lonnet::plaintext($role,$crstype);
         }
         if (($role ne 'cr') || (!$show_separate_custom)) {
             $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
@@ -2023,6 +2027,7 @@ sub set_form_elements {
         }
     }
     $output .= "
+    return;
 }\n";
     return $output;
 }