MDL-12572 MDL-13427 New HTML cleaning code

diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php
index 2bb18e4e148046cb1e6e30c443e76ae1309f9dc7..8415a628168dc10ae562f0e7045734def8b2830d 100644 (file)
--- a/mod/quiz/report/analysis/report.php
+++ b/mod/quiz/report/analysis/report.php
@@ -237,7 +237,7 @@ class quiz_report extends quiz_default_report {
                 $this->Export_CSV($questions, $filename);
                 break;            
             case "HTML":
-              //  $this->Export_HTML($questions, $filename);
+                $this->Export_HTML($questions, $filename);
                 break;
             }
         }
@@ -364,9 +364,6 @@ class quiz_report extends quiz_default_report {
                 $table->add_data(array('', '', $response->text, $response->credit, $response->rcount, $response->rpercent, '', '', '', ''));
             }
         }
-        if( $download == "HTML") {
-           $this->Export_HTML($questions, $filename,$table);
-        }
         print_heading_with_help(get_string("analysistitle", "quiz_analysis"),"itemanalysis", "quiz");
 
         echo '<div id="tablecontainer">';
@@ -678,7 +675,7 @@ class quiz_report extends quiz_default_report {
         }
         exit;
     }
-    function Export_HTML(&$questions, $filename,$table) {
+    function Export_HTML(&$questions, $filename) {
         $headers = array();
         $headers[] = '<span style ="color:blue ;  font-weight : bold;">'.get_string('qidtitle','quiz_analysis').'</span>';
         $headers[] = '<span style ="color:blue ;  font-weight : bold;">'.get_string('qtypetitle','quiz_analysis').'</span>';