Merge remote-tracking branch 'origin/master'

2016-05-23 15:01:48 +02:00 · 2016-05-23 15:01:48 +02:00 · c597189f2c
commit c597189f2c
parent 08badd785b 09a91542c3
1 changed files with 1 additions and 1 deletions
--- a/libraries/session.lib.php
+++ b/libraries/session.lib.php
@ -16,7 +16,7 @@
 function PMA_secureSession()
 {
    // prevent session fixation and XSS
-    if (session_status() === PHP_SESSION_ACTIVE) {
+    if (session_status() === PHP_SESSION_ACTIVE && ! defined('TESTSUITE')) {
        session_regenerate_id(true);
    }
    PMA_generateToken();