--- loncom/interface/lonmenu.pm 2010/12/05 17:24:13 1.309.2.22 +++ loncom/interface/lonmenu.pm 2010/12/05 19:44:36 1.309.2.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.309.2.22 2010/12/05 17:24:13 raeburn Exp $ +# $Id: lonmenu.pm,v 1.309.2.23 2010/12/05 19:44:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -327,7 +327,7 @@ sub gci_secondary_menu { $inventory = $env{'user.domain'}; } my %allnums = &Apache::loncommon::get_faculty_cnums(); - if ($inventory ne '' && ref($allnums{$inventory} eq 'HASH') { + if (($inventory ne '') && (ref($allnums{$inventory}) eq 'HASH')) { foreach my $key (%{$allnums{$inventory}}) { $courses{$inventory.'_'.$key} = $allnums{$inventory}->{$key}; } @@ -1919,12 +1919,10 @@ sub utilityfunctions { my $udom = $env{'user.domain'}; my %crs_by_caller; if (ref($allnums{$udom}) eq 'HASH') { - foreach my $key (%{$allnums{$udom}}) { + foreach my $key (keys(%{$allnums{$udom}})) { $crs_by_caller{$allnums{$udom}->{$key}} = 'st./'.$udom.'/'.$key.'=1'; } } - } - $gcimenujs = <<"ENDCUSTOM"; function switchpage(caller) {