--- loncom/interface/lonnavdisplay.pm 2015/03/01 20:42:08 1.29 +++ loncom/interface/lonnavdisplay.pm 2015/03/01 20:47:54 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Display Handler # -# $Id: lonnavdisplay.pm,v 1.29 2015/03/01 20:42:08 raeburn Exp $ +# $Id: lonnavdisplay.pm,v 1.30 2015/03/01 20:47:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,11 +48,7 @@ sub real_handler { my $r = shift; # Handle header-only request if ($r->header_only) { - if ($env{'browser.mathml'}) { - &Apache::loncommon::content_type($r,'text/xml'); - } else { - &Apache::loncommon::content_type($r,'text/html'); - } + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } @@ -65,18 +61,6 @@ sub real_handler { return REDIRECT; } - - - # Send header, don't cache this page - if ($env{'browser.mathml'}) { - &Apache::loncommon::content_type($r,'text/xml'); - } else { - &Apache::loncommon::content_type($r,'text/html'); - } - &Apache::loncommon::no_cache($r); - - my %toplinkitems=(); - # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); @@ -86,6 +70,9 @@ sub real_handler { $env{'user.reinit'} = 1; return HTTP_NOT_ACCEPTABLE; } + + # Send header, don't cache this page + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # ------------------------------------------------------------ Get query string @@ -125,6 +112,7 @@ sub real_handler { return OK; } + my %toplinkitems=(); my @resources = $navmap->retrieveResources(); my $sequenceCount = 0; my $problemCount = 0;