--- loncom/interface/lonmenu.pm	2009/12/15 05:25:07	1.309.2.4
+++ loncom/interface/lonmenu.pm	2010/01/05 13:18:11	1.309.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.309.2.4 2009/12/15 05:25:07 raeburn Exp $
+# $Id: lonmenu.pm,v 1.309.2.6 2010/01/05 13:18:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -296,6 +296,9 @@ sub gci_secondary_menu {
                   'managetest' => '/adm/menu',
                 );
     my $current = 'managetest';
+    if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+        undef($current);
+    }
     foreach my $key (keys(%courses)) {
         $links{$key} = "javascript:switchpage('$key');";
         if ($env{'request.course.id'} eq $courses{$key}) {
@@ -2010,7 +2013,9 @@ sub hidden_button_check {
         return;
     }
     if ($env{'request.role.adv'}) {
-        return;
+        unless (&Apache::loncommon::needs_gci_custom()) {
+            return;
+        }
     }
     my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide');
     return $buttonshide;