--- loncom/interface/loncommon.pm 2006/12/11 03:43:15 1.490 +++ loncom/interface/loncommon.pm 2006/12/11 21:16:32 1.491 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.490 2006/12/11 03:43:15 raeburn Exp $ +# $Id: loncommon.pm,v 1.491 2006/12/11 21:16:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3009,7 +3009,7 @@ sub blockcheck { } # if they have the evb priv and are currently not playing student next if (($no_ownblock) && - ($env{'request.role'} !~ m{^st\./$cdom/$cnum})); + ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E})); next if ($no_userblock); # Retrieve blocking times and identity of blocker for course @@ -3037,11 +3037,11 @@ sub get_blocks { if ($blocks->{$activity} eq 'on') { push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]); push(@{$$setters{$course}{'times'}}, [$start,$end]); - if ( ($startblock == 0) || ($startblock > $1) ) { - $startblock = $1; + if ( ($startblock == 0) || ($startblock > $start) ) { + $startblock = $start; } - if ( ($endblock == 0) || ($endblock < $2) ) { - $endblock = $2; + if ( ($endblock == 0) || ($endblock < $end) ) { + $endblock = $end; } } }