From df03f4f03895ad1380f10f7adacbc60c6a09f7ee Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Mon, 13 Jul 2009 21:40:43 +0000 Subject: [PATCH] Join editing.js in compilation git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@815 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/bootstrap.inc.php | 19 ++++++++----------- adminer/include/design.inc.php | 2 +- compile.php | 8 +++++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php index 79f3699b..4873f96d 100644 --- a/adminer/include/bootstrap.inc.php +++ b/adminer/include/bootstrap.inc.php @@ -17,24 +17,21 @@ if (isset($_GET["file"])) { header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT"); if ($_GET["file"] == "favicon.ico") { header("Content-Type: image/x-icon"); - echo base64_decode("compile_file('favicon.ico', 'base64_encode')"); + echo base64_decode("compile_file('../adminer/favicon.ico', 'base64_encode');"); } elseif ($_GET["file"] == "default.css") { header("Content-Type: text/css"); - ?>compile_file('default.css', 'minify_css')compile_file('../adminer/default.css', 'minify_css');compile_file('functions.js', 'JSMin::minify')compile_file('editing.js', 'JSMin::minify')compile_file('../adminer/functions.js', 'JSMin::minify');compile_file('editing.js', 'JSMin::minify');"> - +
\n", "", $file); $file = str_replace('', $_COOKIE["adminer_lang"], $file); } -$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\)~", 'compile_file', $file); // integrate static files +$file = str_replace('' . "\n", "", $file); +$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files $replace = 'htmlspecialchars(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"])) . "?file=\\1&version=' . $VERSION; -$file = preg_replace('~(?:\\.\\./adminer/|\\./)(default\\.css|functions\\.js|editing\\.js|favicon\\.ico)~', '', $file); +$file = preg_replace('~(?:\\.\\./adminer/|\\./)(default\\.css|functions\\.js|favicon\\.ico)~', '', $file); $file = preg_replace('~\\.\\./adminer/((plus|cross|up|down|arrow)\\.gif)~', '" . ' . $replace, $file); $file = str_replace("../externals/jush/", "http://jush.sourceforge.net/", $file); $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);