diff --git a/adminer/file.inc.php b/adminer/file.inc.php index 9444b295..760e874e 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -9,6 +9,9 @@ if ($_GET["file"] == "favicon.ico") { } elseif ($_GET["file"] == "default.css") { header("Content-Type: text/css; charset=utf-8"); echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css')); +} elseif ($_GET["file"] == "dark.css") { + header("Content-Type: text/css; charset=utf-8"); + echo lzw_decompress(compile_file('../adminer/static/dark.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', 'minify_js')); diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 02e634c1..d0696b9d 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -98,7 +98,7 @@ class Adminer { */ function head() { ?> - + ', $_SESSION["lang"], $file); } -$file = str_replace('' . "\n", "", $file); -$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); -$file = str_replace('' . "\n", "", $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 = str_replace('' . "\n", "", $file); // merged into default.css $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files $replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"'; $file = preg_replace('~\.\./adminer/static/(default\.css|favicon\.ico)~', '', $file);