Merge remote-tracking branch 'origin/master'

2017-02-14 15:26:02 +01:00 · 2017-02-14 15:26:02 +01:00 · ee46603530
commit ee46603530
parent 4fecf16851 563036022c
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)) {