diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index edd44f99..1a561037 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -19,7 +19,7 @@ if ($_GET["file"] == "favicon.ico") {
echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
} elseif ($_GET["file"] == "jush.js") {
header("Content-Type: text/javascript; charset=utf-8");
- echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.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('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.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/adminer.inc.php b/adminer/include/adminer.inc.php
index 7bc51a4d..d8a672dd 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -243,6 +243,9 @@ focus(document.getElementById('username'));
if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
$return = "" . lang('%d byte(s)', strlen($original)) . "";
}
+ if (preg_match('~json~', $field["type"])) {
+ $return = "$return
";
+ }
return ($link ? "$return" : $return);
}
@@ -855,11 +858,14 @@ focus(document.getElementById('username'));
$connection->select_db(DB);
$tables = table_status('', true);
}
- if (support("sql")) {
- ?>
+ ?>
+
+
' . "\n", "", $file);
$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