Merge branch 'QA_4_6' into QA_4_6-security

2016-12-08 12:04:38 +01:00 · 2016-12-08 12:04:38 +01:00 · 053e73d0c3
commit 053e73d0c3
parent 3b6ed1f9ec d61dbc1d6f
1 changed files with 5 additions and 1 deletions
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@ -1162,5 +1162,9 @@ function PMA_safeUnserialize($data)
        return null;
    }

-    return unserialize($data);
+    if (PHP_VERSION_ID < 70000) {
+        return unserialize($data);
+    } else {
+        return unserialize($data, false);
+    }
 }