--- loncom/auth/lonlogout.pm	2012/02/01 18:13:46	1.42.2.2.2.1
+++ loncom/auth/lonlogout.pm	2012/02/13 16:59:24	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42.2.2.2.1 2012/02/01 18:13:46 raeburn Exp $
+# $Id: lonlogout.pm,v 1.45 2012/02/13 16:59:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,8 +89,6 @@ sub handler {
     return OK if $r->header_only;
 # -------------------------------------------------------- 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='';
@@ -103,8 +101,7 @@ sub handler {
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-                           {'no_inline_link' => 1,
-                            'no_nav_bar'     => 1,});
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -127,7 +124,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) {
@@ -178,7 +175,6 @@ Due to security reasons in new web brows
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT