--- loncom/auth/lonroles.pm 2016/10/19 13:12:58 1.317 +++ loncom/auth/lonroles.pm 2016/10/20 19:53:58 1.318 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.317 2016/10/19 13:12:58 raeburn Exp $ +# $Id: lonroles.pm,v 1.318 2016/10/20 19:53:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1078,10 +1078,10 @@ ENDHEADER $roletext{'user.role.'.$role}->[1]. &Apache::loncommon::end_data_table_row(); } - if ($role =~ m{^user\.role\.dc\./($match_domain)/} + if ($role =~ m{^dc\./($match_domain)/$} && $dcroles{$1}) { $output .= &adhoc_roles_row($1,'recent'); - } elsif ($role =~ m{^user\.role\.dh\./($match_domain)/} + } elsif ($role =~ m{^dh\./($match_domain)/$} && ($env{'environment.adhocroles.'.$1} ne '')) { $output .= &adhoc_customroles_row($1,'recent'); }