Merge pull request #1762 from madhuracj/rfe1561

RFE #1561 Being able to use multiple servers at the same time when using cookie auth

libraries/common.inc.php

@@ -872,7 +872,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
         if (! $auth_plugin->authCheck()) {
             /* Force generating of new session on login */
-            PMA_secureSession();
+            if ($token_provided) {
+                PMA_secureSession();
+            }
             $auth_plugin->auth();
         } else {
             $auth_plugin->authSetUser();

libraries/select_server.lib.php

@@ -35,7 +35,6 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             )
             . '" class="disableAjax">';
-        $retval .= PMA_getHiddenFields(array('token' => $_SESSION[' PMA_token ']));
 
         if (! $omit_fieldset) {
             $retval .= '<fieldset>';

test/libraries/PMA_select_server_test.php

@@ -125,12 +125,6 @@ class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            '<input type="hidden" name="token" value="token" />',
-            $html
-        );
-
         //labels
         $this->assertContains(
             __('Current Server:'),