gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Session-based upload progress was incompletely disabled since 063a2d99

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-04-17 08:34:00 -04:00
parent 237e8a5f73
commit 777d9f5fe4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
import_status.php
View File

@ -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();