Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-12-16 21:31:31 +01:00
commit f0bbd00186
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 4 additions and 2 deletions

View File

@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog
- issue Fixed url.php crashing because it's not loading the DatabaseInterface service
- issue #15540 Fixed uncaught TypeError: htmlspecialchars() in NavigationTree
- issue Fix twig deprecation notices for php 8.0
- issue #15435 Fix ReCAPTCHA couldn't find user-provided function: Functions.recaptchaCallback
4.9.3 (not yet released)
- issue #15570 Fix page contents go underneath of floating menubar in some cases

View File

@ -4914,8 +4914,9 @@ Functions.toggleDatepickerIfInvalid = function ($td, $inputField) {
/**
* Function to submit the login form after validation is done.
* NOTE: do NOT use a module or it will break the callback, issue #15435
*/
Functions.recaptchaCallback = function () {
Functions_recaptchaCallback = function () {
$('#login_form').trigger('submit');
};

View File

@ -76,7 +76,7 @@
<fieldset class="tblFooters">
{% if has_captcha %}
<script src="https://www.google.com/recaptcha/api.js?hl={{ lang }}" async defer></script>
<input class="btn btn-primary g-recaptcha" data-sitekey="{{ captcha_key }}" data-callback="Functions.recaptchaCallback" value="{% trans 'Go' %}" type="submit" id="input_go">
<input class="btn btn-primary g-recaptcha" data-sitekey="{{ captcha_key }}" data-callback="Functions_recaptchaCallback" value="{% trans 'Go' %}" type="submit" id="input_go">
{% else %}
<input class="btn btn-primary" value="{% trans 'Go' %}" type="submit" id="input_go">
{% endif %}