Merge branch 'MAINT_4_0_5' into QA_4_0

This commit is contained in:
Michal Čihař 2013-07-30 09:41:13 +02:00
commit 41e06a48fd

View File

@ -531,7 +531,9 @@ class PMA_Header
$retval = '<meta charset="utf-8" />';
$retval .= '<meta name="robots" content="noindex,nofollow" />';
$retval .= '<meta http-equiv="X-UA-Compatible" content="IE=Edge">';
$retval .= '<style>html{display: none;}</style>';
if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) {
$retval .= '<style>html{display: none;}</style>';
}
return $retval;
}