[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[raeburn]

raeburn		Tue Dec  6 03:28:29 2016 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Bug 6840
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.650 loncom/interface/lonprintout.pm:1.651
--- loncom/interface/lonprintout.pm:1.650	Wed Aug 10 16:06:03 2016
+++ loncom/interface/lonprintout.pm	Tue Dec  6 03:28:29 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.650 2016/08/10 16:06:03 raeburn Exp $
+# $Id: lonprintout.pm,v 1.651 2016/12/06 03:28:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2743,7 +2743,7 @@
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-      
+
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
@@ -2956,12 +2956,13 @@
 	    my $texversion='';
 	    if ($urlp!~m|^/adm/|
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+                my $extension = $1;
 		$resources_printed .= $urlp.':';
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
 		    $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
                     unless (($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') ||
-                            (($i==0) &&
+                            (($i==0) && ($extension !~ /^x?html?$/) &&
                              (($urlp=~/\.page$/) ||
                               ($print_type eq 'map_problems_in_page') ||
                               ($print_type eq 'map_resources_in_page')))) {