Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

phpmyadmin · Oct 5, 2016 · c4a2e1b · c4a2e1b
2 parents 39f4a59 + 889cd31
commit c4a2e1b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/prefs_manage.php b/prefs_manage.php
@@ -62,9 +62,9 @@
             $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
             if (@is_writable($tmp_subdir)) {
                 $import_file_new = tempnam($tmp_subdir, 'prefs');
+                $file_to_unlink = $import_file_new;
                 if (move_uploaded_file($import_file, $import_file_new)) {
                     $import_file = $import_file_new;
-                    $file_to_unlink = $import_file_new;
                 }
             }
         }