diff --git a/adminer/file.inc.php b/adminer/file.inc.php index 0b3e8e7d..c89feb46 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -18,6 +18,7 @@ if ($_GET["file"] == "favicon.ico") { case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break; case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break; case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break; + case "loader.gif": echo base64_decode("compile_file('../adminer/static/loader.gif', 'base64_encode');"); break; } } exit; diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index d9692133..c47519f3 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -123,7 +123,7 @@ document.getElementById('username').focus(); */ function selectQuery($query) { global $jush; - return "
>> " . h(str_replace("\n", " ", $query)) . "
" . lang('Edit') . "\n";
+ return "
>> " . h(str_replace("\n", " ", $query)) . "
" . lang('Edit') . " #\n";
}
/** Description of a row in a table
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 621ec5bc..21301985 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -10,9 +10,10 @@ 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
- $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");
+ ?>
@@ -31,33 +32,35 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
" . lang('Unable to select the table') . ($fields ? "." : ": " . error()) . "\n"; } else { - echo "