diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-13 00:02:40 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-13 00:02:40 +0400 |
| commit | a7c0c55c7fa9c0ee45cef59245e2572f3c2f1be1 (patch) | |
| tree | 5796d8d201939016ef01bacc626f517e10f56795 /import.php | |
| parent | 64926ead73dadd10b323712304d72fa86c6a3982 (diff) | |
| parent | 9147f30dc6b00dc63c998f1d2d3972d1a47e6c57 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
js/server_status.js
libraries/common.lib.php
tbl_printview.php
tbl_select.php
tbl_structure.php
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import.php b/import.php index a16f9fd191..f30529369f 100644 --- a/import.php +++ b/import.php @@ -237,7 +237,7 @@ if (!empty($local_import_file) && !empty($cfg['UploadDir'])) { $local_import_file = PMA_securePath($local_import_file); $import_file = PMA_userDir($cfg['UploadDir']) . $local_import_file; -} elseif (empty($import_file) || !is_uploaded_file($import_file)) { +} elseif (empty($import_file) || !is_uploaded_file($import_file)) { $import_file = 'none'; } |