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

2014-03-22 17:53:39 +01:00 · 2014-03-22 17:53:39 +01:00 · ad9fcbe9fe
commit ad9fcbe9fe
parent 82e31a9144 b9039ee3d9
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================

 4.1.11.0 (not yet released)
+- bug #4335 reCaptcha problem (4.1.10 regression) 

 4.1.10.0 (2014-03-22)
 - bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@ -474,7 +474,7 @@ class PMA_Header
                "Content-Security-Policy: default-src 'self' "
                . ($use_captcha ? 'https://www.google.com ' : ' ')
                . $GLOBALS['cfg']['CSPAllow'] . ';'
-                . "script-src 'self' 'unsafe-inline' 'unsafe-eval'"
+                . "script-src 'self' 'unsafe-inline' 'unsafe-eval' "
                . ($use_captcha ? 'https://www.google.com ' : ' ')
                . ";"
                . "style-src 'self' 'unsafe-inline' "