Merge remote-tracking branch 'origin/master'

2016-02-03 19:56:44 +01:00 · 2016-02-03 19:56:44 +01:00 · 0be1869339
commit 0be1869339
parent 8618600876 e3843ab1a9
1 changed files with 1 additions and 1 deletions
--- a/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ b/test/classes/plugin/auth/AuthenticationHttpTest.php
@ -142,7 +142,7 @@ class AuthenticationHttpTest extends PMATestCase

        $this->doMockResponse(
            0, 0, 0,
-            array('Location: http://phpmyadmin.net/logout')
+            array('Location: http://phpmyadmin.net/logout' . ((SID) ? SID : ''))
        );
    }