Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

2017-02-14 15:24:56 +01:00 · 2017-02-14 15:24:56 +01:00 · c603141bdd
commit c603141bdd
parent bdb29a04d6 0b1c182703
1 changed files with 4 additions and 2 deletions
--- a/libraries/URL.php
+++ b/libraries/URL.php
@ -112,8 +112,10 @@ class URL
    {
        $fields = '';

-        /* Always include token */
-        $values['token'] = $_SESSION[' PMA_token '];
+        /* Always include token in plain forms */
+        if ($pre === '') {
+            $values['token'] = $_SESSION[' PMA_token '];
+        }

        foreach ($values as $name => $value) {
            if (! empty($pre)) {