--- loncom/localize/lonlocal.pm 2008/05/16 16:11:56 1.44 +++ loncom/localize/lonlocal.pm 2008/05/31 23:37:49 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.44 2008/05/16 16:11:56 raeburn Exp $ +# $Id: lonlocal.pm,v 1.45 2008/05/31 23:37:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -267,9 +267,16 @@ sub get_language_handle { # ========================================================== Localize localtime sub gettimezone { - my ($time) = @_; if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) { return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}; + } elsif ($Apache::lonnet::env{'request.course.id'} ne '') { + my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'}; + if ($cdom ne '') { + my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); + if ($domdefaults{'timezone_def'} ne '') { + return $domdefaults{'timezone_def'}; + } + } } return 'local'; }