Fix PHP 5.4 upload progress working only with session.upload_progress.cleanup set to Off

1 files changed, 11 insertions, 2 deletions

diff --git a/import_status.php b/import_status.php
index d056c3e1d4..4e06ca4103 100644
--- a/import_status.php
+++ b/import_status.php
@@ -25,12 +25,12 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')
 ) {
 
     $sessionupload = array();
-    $prefix = ini_get('session.upload_progress.prefix');
+    define('UPLOAD_PREFIX', ini_get('session.upload_progress.prefix'));
 
     session_start();
     foreach ($_SESSION as $key => $value) {
         // only copy session-prefixed data
-        if (substr($key, 0, strlen($prefix)) == $prefix) {
+        if (substr($key, 0, strlen(UPLOAD_PREFIX)) == UPLOAD_PREFIX) {
             $sessionupload[$key] = $value;
         }
     }
@@ -54,6 +54,15 @@ if (defined('SESSIONUPLOAD')) {
     foreach ($sessionupload as $key => $value) {
         $_SESSION[$key] = $value;
     }
+
+    // remove session upload data that are not set anymore
+    foreach ($_SESSION as $key => $value) {
+        if (substr($key, 0, strlen(UPLOAD_PREFIX)) == UPLOAD_PREFIX
+            && ! isset($sessionupload[$key])
+        ) {
+            unset($_SESSION[$key]);
+        }
+    }
 }
 
 /**