diff --git a/adminer/file.inc.php b/adminer/file.inc.php index 24230d63..e397e36d 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -23,6 +23,7 @@ if ($_GET["file"] == "default.css") { } 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-autocomplete-sql.js; ../externals/jush/modules/jush-textarea.js; ../externals/jush/modules/jush-txt.js; ../externals/jush/modules/jush-js.js; diff --git a/compile.php b/compile.php index a6f39e70..2f6b8feb 100755 --- a/compile.php +++ b/compile.php @@ -312,7 +312,7 @@ if ($vendor) { $file = str_replace(");\n\t\techo \$this->loginFormField('server', '' . lang('Server') . '', ' [^,]*,?~", '', $links); @@ -334,7 +334,7 @@ if ($_SESSION["lang"]) { $file = str_replace('', $_SESSION["lang"], $file); } $file = str_replace('echo script_src("static/editing.js");' . "\n", "", $file); // merged into functions.js -$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); // merged into jush.js +$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(autocomplete-sql|textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); // merged into jush.js $file = preg_replace('~echo .*/jush(-dark)?.css\'>.*~', '', $file); // merged into default.css or dark.css if (function_exists('stripTypes')) { $file = stripTypes($file);