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

This commit is contained in:
Weblate 2015-05-26 21:03:04 +02:00
commit 7ea89b27da
2 changed files with 2 additions and 1 deletions

View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug Browse foreigners window goes out of the window
- bug #4918 Date field popup dialog position bug
- bug In /setup, PMA_messages is not defined
- bug #4924 Recaptcha failure
4.4.7.0 (2015-05-16)
- bug #4876 Settings issues (Favorite tables shown twice in Settings)

View File

@ -487,7 +487,7 @@ if ($token_mismatch) {
'pma_lang', 'pma_collation_connection',
/* Possible login form */
'pma_servername', 'pma_username', 'pma_password',
'recaptcha_challenge_field', 'recaptcha_response_field',
'g-recaptcha-response',
/* Needed to send the correct reply */
'ajax_request',
/* Permit to log out even if there is a token mismatch */