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

phpmyadmin · Feb 3, 2014 · 28e64b9 · 28e64b9
2 parents 71a1c4d + 36e544c
commit 28e64b9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -261,7 +261,8 @@ public function auth()
             // 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'] . '&amp;'
+                    . 'k=' . $GLOBALS['cfg']['CaptchaLoginPublicKey']
+                    . PMA_URL_getArgSeparator('html')
                     . 'hl=' . $GLOBALS['lang'] . '">
                  </script>
                  <noscript>