--- loncom/interface/loncommon.pm	2009/12/14 22:40:45	1.925.2.4
+++ loncom/interface/loncommon.pm	2010/01/06 18:17:30	1.925.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.4 2009/12/14 22:40:45 raeburn Exp $
+# $Id: loncommon.pm,v 1.925.2.6 2010/01/06 18:17:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4548,7 +4548,8 @@ sub bodytag {
 
         my $role_selector;
         if (($custommenu) && ($env{'request.course.id'}) && 
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest')) {
+            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest') &&
+            ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
             $role_selector = &Apache::lonmenu::roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
                         $env{'course.' . $env{'request.course.id'} . '.num'}  );
@@ -4580,7 +4581,8 @@ sub bodytag {
 
         #don't show menus for public users
         if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
-            if ($custommenu) {
+            if (($custommenu) && 
+                ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
                 $bodytag .= &Apache::lonmenu::gci_secondary_menu();
             } else { 
                 $bodytag .= Apache::lonmenu::secondary_menu();
@@ -10784,9 +10786,9 @@ sub check_for_gci_dc {
 }
 
 sub existing_gcitest_courses {
+    my ($role) = @_;
     my %courses;
     my $cdom = 'gcitest';
-    my $role = 'cc';
     my $now = time;
     foreach my $envkey (keys(%env)) {
         my $cnum;