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

2014-02-02 17:46:30 +01:00 · 2014-02-02 17:46:30 +01:00 · e55990e513
commit e55990e513
parent 2ae64dacc0 6a7d3f9ed7
2 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 - bug #4265 Missing datepicker icon for DATETIME(length)
 - bug #4257 Hide fractional seconds when applicable
 - bug #4264 Uncheck "Ignore" while inserting, upon leaving a textarea
+- bug #4260 reCaptcha is ignoring language settings

 4.1.6.0 (2014-01-26)
 - bug #4232 User not found after creating the user
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@ -260,8 +260,9 @@ class AuthenticationCookie extends AuthenticationPlugin
        ) {
            // If enabled show captcha to the user on the login screen.
            echo '<script type="text/javascript"
-                    src="https://www.google.com/recaptcha/api/challenge?k='
-                . $GLOBALS['cfg']['CaptchaLoginPublicKey'] . '">
+                    src="https://www.google.com/recaptcha/api/challenge?'
+                    . 'k=' . $GLOBALS['cfg']['CaptchaLoginPublicKey'] . '&'
+                    . 'hl=' . $GLOBALS['lang'] . '">
                 </script>
                 <noscript>
                    <iframe src="https://www.google.com/recaptcha/api/noscript?k='