diff --git a/adminer/file.inc.php b/adminer/file.inc.php index d2ab6db60..332e58fad 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -3,21 +3,21 @@ if ($_GET["file"] == "favicon.ico") { header("Content-Type: image/x-icon"); - echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');"); + echo 'compile_file("../adminer/static/favicon.ico", "add_apo_slashes");'; } elseif ($_GET["file"] == "default.css") { header("Content-Type: text/css; charset=utf-8"); - ?>compile_file('../adminer/static/default.css', 'minify_css');compile_file("../adminer/static/default.css", "minify_css");compile_file('../adminer/static/functions.js', 'jsShrink');compile_file('static/editing.js', 'jsShrink');compile_file("../adminer/static/functions.js", "jsShrink");compile_file("static/editing.js", "jsShrink");', $_SESSION["lang"], $file); } $file = str_replace('' . "\n", "", $file); - $file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files + $file = preg_replace_callback('~compile_file\\("([^"]+)", "([^"]+)"\\);~', 'compile_file', $file); // integrate static files $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&version=' . $VERSION; $file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '', $file); $file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file); diff --git a/todo.txt b/todo.txt index 89f0bb5d3..4c59583be 100644 --- a/todo.txt +++ b/todo.txt @@ -13,7 +13,7 @@ Selectable