Merge branch 'm33_MDL-58027_Restore_Missing_HTMLEntities_Call' of htt…

…ps://github.com/scara/moodle
ralferlebach · Mar 14, 2017 · fc31b06 · fc31b06
2 parents edf1028 + bf4f857
commit fc31b06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/filelib.php b/lib/filelib.php
@@ -2264,7 +2264,7 @@ function send_file($path, $filename, $lifetime = null , $filter=0, $pathisstring
             $options->newlines = false;
             $options->noclean = true;
             if (is_object($path)) {
-                $text = $path->get_content();
+                $text = htmlentities($path->get_content(), ENT_QUOTES, 'UTF-8');
             } else if ($pathisstring) {
                 $text = htmlentities($path, ENT_QUOTES, 'UTF-8');
             } else {