--- loncom/interface/loncommon.pm	2006/12/01 20:17:47	1.482
+++ loncom/interface/loncommon.pm	2006/12/01 21:52:29	1.483
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.482 2006/12/01 20:17:47 raeburn Exp $
+# $Id: loncommon.pm,v 1.483 2006/12/01 21:52:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2855,8 +2855,8 @@ sub findallcourses {
         }
     } else {
         foreach my $key (keys(%env)) {
-	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} ||
-                 $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$}) {
+	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} ||
+                 $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
 	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
 	        next if ($role eq 'ca' || $role eq 'aa');
 	        next if (%roles && !exists($roles{$role}));