Merge remote-tracking branch 'origin/QA_4_1'

This commit is contained in:
Michal Čihař 2014-03-19 21:39:34 +01:00
commit 80e466a58d

View File

@ -477,7 +477,7 @@ class PMA_Header
. "script-src 'self' 'unsafe-inline' 'unsafe-eval'"
. ($use_captcha ? 'https://www.google.com ' : ' ')
. ";"
. "style-src 'unsafe-inline' ".
. "style-src 'unsafe-inline' "
. ($use_captcha ? 'https://www.google.com ' : ' ')
. $GLOBALS['cfg']['CSPAllow']
. ";"