diff options
author | Marc Delisle <marc@infomarc.info> | 2014-04-17 16:34:00 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2014-04-17 16:34:00 +0400 |
commit | 777d9f5fe415488a4717141a78f783d8a95a3aaf (patch) | |
tree | b31bb3c7750db854f5140ac81d42fbd164319217 /import_status.php | |
parent | 237e8a5f73e840a260f579a75e7a2f02e10cd54c (diff) |
Session-based upload progress was incompletely disabled since 063a2d99
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'import_status.php')
-rw-r--r-- | import_status.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/import_status.php b/import_status.php index f31e424f38..33b901aedd 100644 --- a/import_status.php +++ b/import_status.php @@ -17,8 +17,13 @@ * Until this is fixed, we need to load the default session to load the data, * export the upload progress information from there, * and re-import after switching to our session. + * + * However, since https://github.com/phpmyadmin/phpmyadmin/commit/063a2d99 + * we have deactivated this feature, so the corresponding code is now + * commented out. */ +/* if (version_compare(PHP_VERSION, '5.4.0', '>=') && ini_get('session.upload_progress.enabled') ) { @@ -40,12 +45,14 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=') session_name('phpMyAdmin'); session_id($_COOKIE['phpMyAdmin']); } + */ define('PMA_MINIMUM_COMMON', 1); require_once 'libraries/common.inc.php'; require_once 'libraries/display_import_ajax.lib.php'; +/* if (defined('SESSIONUPLOAD')) { // write sessionupload back into the loaded PMA session @@ -63,6 +70,7 @@ if (defined('SESSIONUPLOAD')) { } } } + */ // AJAX requests can't be cached! PMA_noCacheHeader(); |