]> git.joonet.de Git - adminer.git/commitdiff
Merge branch 'master' into ajax
authorJakub Vrana <jakub@vrana.cz>
Mon, 18 Oct 2010 05:50:03 +0000 (07:50 +0200)
committerJakub Vrana <jakub@vrana.cz>
Mon, 18 Oct 2010 05:52:49 +0000 (07:52 +0200)
1  2 
adminer/include/adminer.inc.php
adminer/include/design.inc.php
adminer/select.inc.php
editor/include/adminer.inc.php

Simple merge
index 2130198557ad06e7ec210a6b596be9733965c945,81b40d115841825545495d64f390cb4cf320b0bc..a7716bb7edf1efea65a52a5b92204738dcec93cd
@@@ -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");
 +              ?>
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <html lang="<?php echo $LANG; ?>">
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Simple merge
Simple merge