diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 75da39d4..f7654261 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -15,7 +15,7 @@ if ($_GET["file"] == "favicon.ico") {
echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
} elseif ($_GET["file"] == "functions.js") {
header("Content-Type: text/javascript; charset=utf-8");
- echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js;../externals/jush/modules/jush.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+ echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js;../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
} else {
header("Content-Type: image/gif");
switch ($_GET["file"]) {
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 8f4f549c..cc06c2e4 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -23,6 +23,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
+
head()) { ?>
diff --git a/changes.txt b/changes.txt
index 6179ee5c..6fe9bbd9 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,10 +1,11 @@
Adminer 4.0.0-dev:
-Driver for MongoDB, SimpleDB and Elasticsearch
+Driver for SimpleDB, MongoDB and Elasticsearch
+Highlight SQL in textareas
Save and continue edit by AJAX
Split SQL command and import
Add a new column in alter table on key press
Mark length as required for strings
-Add label to database selection
+Add label to database selection, move logout button
Add button for dropping an index
Display number of selected rows
Add links to documentation
diff --git a/compile.php b/compile.php
index d32fef6a..bbe87b1e 100755
--- a/compile.php
+++ b/compile.php
@@ -391,6 +391,7 @@ if ($_SESSION["lang"]) {
}
$file = str_replace('' . "\n", "", $file);
$file = str_replace('' . "\n", "", $file);
+$file = str_replace('' . "\n", "", $file);
$file = str_replace('' . "\n", "", $file);
$file = str_replace('' . "\n", "", $file);
$file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
diff --git a/externals/jush b/externals/jush
index 6185c497..6bfc2f2d 160000
--- a/externals/jush
+++ b/externals/jush
@@ -1 +1 @@
-Subproject commit 6185c4979c7644b69acd9968ab5ea2d67ee7760b
+Subproject commit 6bfc2f2d971d8d0adbad8acfb2ec7c4702eee684