diff --git a/ChangeLog b/ChangeLog index a8164e3aee..2cdffd5d57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - bug #4445 Fatal error on SQL Export of join query - bug #4448 Dump binary columns in hexadecimal notation not working - Regenerate cookie encryption IV for every session +- bug #4405 Cannot import (open_basedir): fix another case 4.2.3.0 (2014-06-08) - bug #4423 Moving fields not working diff --git a/import.php b/import.php index 980f5a0f71..a96b159a83 100644 --- a/import.php +++ b/import.php @@ -374,6 +374,9 @@ if ($import_file != 'none' && ! $error) { * system's tmp dir */ $tmp_subdir = ini_get('upload_tmp_dir'); + if (empty($tmp_subdir)) { + $tmp_subdir = sys_get_temp_dir(); + } if (is_writable($tmp_subdir)) { diff --git a/js/functions.js b/js/functions.js index c144712f89..09136ac165 100644 --- a/js/functions.js +++ b/js/functions.js @@ -422,6 +422,7 @@ function confirmQuery(theForm1, sqlQuery1) */ function checkSqlQuery(theForm) { + var sqlQuery; // get the textarea element containing the query var sqlQuery; if (codemirror_editor) {