--- loncom/auth/lonlogout.pm	2012/01/08 23:35:22	1.42.2.3
+++ loncom/auth/lonlogout.pm	2013/02/08 17:11:59	1.45.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42.2.3 2012/01/08 23:35:22 raeburn Exp $
+# $Id: lonlogout.pm,v 1.45.2.2 2013/02/08 17:11:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,6 +70,9 @@ sub handler {
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     unlink("$lonidsdir/$handle.id");
+    if (!$Apache::lonlocal::lh) {
+        &Apache::lonlocal::get_language_handle($r);
+    }
     my %temp=('logout' => time);
     &Apache::lonnet::put('email_status',\%temp);
     &Apache::lonnet::log($env{'user.domain'},
@@ -90,7 +93,6 @@ sub handler {
 # -------------------------------------------------------- Menu script and info
 
     my $windowinfo=&Apache::lonmenu::close();
-    $windowinfo.=&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -127,7 +129,7 @@ sub handler {
                                       '://'.$server.$path;
                          if (($path eq '') && (!$isredirect)) {
                              my $serverhomeID =
-                                 &Apache::lonnet::get_server_homeID($lonhost);
+                                 &Apache::lonnet::get_server_homeID($server);
                              my $serverhomedom =
                                  &Apache::lonnet::host_domain($serverhomeID);
                              if ($serverhomedom ne $domain) {