From: Jakub Vrana Date: Mon, 18 Oct 2010 05:50:03 +0000 (+0200) Subject: Merge branch 'master' into ajax X-Git-Tag: v3.2.0~140^2~18 X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=a1f276930959cd5ebc29f6c7a7ff25c3efc510ba;p=adminer.git Merge branch 'master' into ajax --- a1f276930959cd5ebc29f6c7a7ff25c3efc510ba diff --cc adminer/include/design.inc.php index 21301985,81b40d11..a7716bb7 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@@ -9,11 -9,10 +9,11 @@@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { global $LANG, $HTTPS, $adminer, $connection, $drivers; header("Content-Type: text/html; charset=utf-8"); - header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox NoScript plugin + $adminer->headers(); - $title_all = $title . ($title2 != "" ? ": " . h($title2) : ""); - $protocol = ($HTTPS ? "https" : "http"); - ?> + if ($_SERVER["HTTP_X_REQUESTED_WITH"] != "XMLHttpRequest") { + $title_all = $title . ($title2 != "" ? ": " . h($title2) : ""); + $protocol = ($HTTPS ? "https" : "http"); + ?>