Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #3889 When login fails and error display is active, login data is displayed
 - bug #3890 [import] Web server upload directory import fails
 - bug #3891 [import] Server upload folder import file name missing in success message 
++ rfe #1421 [auth] Add retry button on connection failure with config auth
 
 4.0.0.0 (not yet released)
 + Patch #3481047 for rfe #3480477 Insert as new row enhancement

libraries/plugins/auth/AuthenticationConfig.class.php

@@ -77,6 +77,7 @@ class AuthenticationConfig extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         $response->getFooter()->setMinimal();
         $header = $response->getHeader();
+        $header->setBodyId('loginform');
         $header->setTitle(__('Access denied'));
         $header->disableMenu();
         echo '<br /><br />
@@ -132,7 +133,16 @@ class AuthenticationConfig extends AuthenticationPlugin
         }
         $GLOBALS['error_handler']->dispUserErrors();
         echo '</td>
-        </tr>';
+        </tr>
+        <tr>
+            <td>' . "\n";
+        echo '<a href="' 
+            . $GLOBALS['cfg']['DefaultTabServer']
+            . PMA_generate_common_url(array()) . '" class="button disableAjax">'
+            . __('Retry to connect')
+            . '</a>' . "\n";
+        echo '</td>
+        </tr>' . "\n";
         if (count($GLOBALS['cfg']['Servers']) > 1) {
             // offer a chance to login to other servers if the current one failed
             include_once './libraries/select_server.lib.php';