--- loncom/interface/lonhtmlcommon.pm	2010/11/29 04:40:12	1.253.2.6
+++ loncom/interface/lonhtmlcommon.pm	2010/12/05 21:58:49	1.253.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.253.2.6 2010/11/29 04:40:12 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.253.2.8 2010/12/05 21:58:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -700,6 +700,8 @@ sub get_date_from_form {
             if (&Apache::lonlocal::gettimezone($timezone) eq 'local') {
                 $timezone = &Apache::lonlocal::gettimezone();
             }
+        } else {
+            $timezone = &Apache::lonlocal::gettimezone();
         }
         my $dt = DateTime->new( year   => $year,
                                 month  => $month,
@@ -1395,7 +1397,7 @@ returns: nothing
                 if ((exists($env{'request.course.id'})) &&
                     ($env{'request.course.id'} ne '') && 
                     !($env{'form.context'} eq 'requestcrs')) {
-                    if ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+                    if ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} =~ /^\w+citest$/)) {
                         if ($env{'environment.remotenavmap'} eq 'on') {
                             # open link using javascript when remote navmap is activated
                             $href = "javascript:gonav('/adm/navmaps');";