diff --git a/adminer/file.inc.php b/adminer/file.inc.php index f46df20a..219fac01 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -15,7 +15,10 @@ 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-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('../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')); } else { header("Content-Type: image/gif"); switch ($_GET["file"]) { diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 63f3ae89..9c27b7d1 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -68,16 +68,9 @@ class Adminer { * @return bool true to link adminer.css if exists */ function head() { - global $jush; - if (support("sql")) { - ?> + ?> - - - - + + + + +databasesPrint($missing); if (DB == "" || !$missing) { echo "
" . (support("sql") ? "" . lang('SQL command') . "\n" . lang('Import') . "\n" : "") . ""; @@ -814,7 +815,6 @@ username.form['auth[driver]'].onchange(); $links[] = preg_quote($table, '/'); } echo "' . "\n", "", $file); -$file = str_replace('' . "\n", "", $file); $file = str_replace('' . "\n", "", $file); $file = str_replace('' . "\n", "", $file); $file = str_replace('' . "\n", "", $file); @@ -399,6 +401,7 @@ $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", ' $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&version=' . $VERSION . ($driver ? '&driver=' . $driver : ''); $file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '', $file); $file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file); +$file = preg_replace('~\\.\\./externals/jush/modules/(jush\\.js)~', '', $file); $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file); $file = php_shrink($file);