Merge branch 'MAINT_4_0_5' into QA_4_0

phpmyadmin · Jul 30, 2013 · 41e06a4 · 41e06a4
2 parents 7cb3344 + da4042f
commit 41e06a4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -531,7 +531,9 @@ private function _getMetaTags()
         $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;
     }