Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle

moodle · Jul 28, 2014 · aba225f · aba225f
2 parents d8d240e + 03bdb0a
commit aba225f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/csvlib.class.php b/lib/csvlib.class.php
@@ -104,7 +104,7 @@ function load_csv_content(&$content, $encoding, $delimiter_name, $column_validat
         // Create a temporary file and store the csv file there,
         // do not try using fgetcsv() because there is nothing
         // to split rows properly - fgetcsv() itself can not do it.
-        $tempfile = tempnam(make_temp_directory('/cvsimport'), 'tmp');
+        $tempfile = tempnam(make_temp_directory('/csvimport'), 'tmp');
         if (!$fp = fopen($tempfile, 'w+b')) {
             $this->_error = get_string('cannotsavedata', 'error');
             @unlink($tempfile);