MDL-16918 fixed deleting in csv import file - thanks Luis de Vasconcelos; merged...

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 808d689005dfd10a6f820be9130a9ba842e788b9..be8d90af0825cb0e8171db3257ea04f3499ccf1a 100755 (executable)
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -200,6 +200,7 @@ if ($formdata = $mform->get_data()) {
                 $maperrors[$j] = true;
             } else {
                 // collision
+                fclose($fp);
                 unlink($filename); // needs to be uploaded again, sorry
                 print_error('cannotmapfield', '', '', $j);
             }
@@ -487,6 +488,7 @@ if ($formdata = $mform->get_data()) {
             grade_import_commit($course->id, $importcode);
         }
         // temporary file can go now
+        fclose($fp);
         unlink($filename);
     } else {
         print_error('cannotreadfil');