\n";
+ echo "
\n";
}
}
}
diff --git a/adminer/arrow.gif b/adminer/static/arrow.gif
similarity index 100%
rename from adminer/arrow.gif
rename to adminer/static/arrow.gif
diff --git a/adminer/cross.gif b/adminer/static/cross.gif
similarity index 100%
rename from adminer/cross.gif
rename to adminer/static/cross.gif
diff --git a/adminer/default.css b/adminer/static/default.css
similarity index 100%
rename from adminer/default.css
rename to adminer/static/default.css
diff --git a/adminer/down.gif b/adminer/static/down.gif
similarity index 100%
rename from adminer/down.gif
rename to adminer/static/down.gif
diff --git a/adminer/editing.js b/adminer/static/editing.js
similarity index 100%
rename from adminer/editing.js
rename to adminer/static/editing.js
diff --git a/adminer/favicon.ico b/adminer/static/favicon.ico
similarity index 100%
rename from adminer/favicon.ico
rename to adminer/static/favicon.ico
diff --git a/adminer/functions.js b/adminer/static/functions.js
similarity index 100%
rename from adminer/functions.js
rename to adminer/static/functions.js
diff --git a/adminer/plus.gif b/adminer/static/plus.gif
similarity index 100%
rename from adminer/plus.gif
rename to adminer/static/plus.gif
diff --git a/adminer/up.gif b/adminer/static/up.gif
similarity index 100%
rename from adminer/up.gif
rename to adminer/static/up.gif
diff --git a/compile.php b/compile.php
index 5e0e82aa..6a539052 100644
--- a/compile.php
+++ b/compile.php
@@ -190,8 +190,8 @@ if ($_SESSION["lang"]) {
$file = str_replace('' . "\n", "", $file);
$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
$replace = 'h(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"])) . "?file=\\1&version=' . $VERSION;
-$file = preg_replace('~\\.\\./adminer/(default\\.css|functions\\.js|favicon\\.ico)~', '', $file);
-$file = preg_replace('~\\.\\./adminer/((plus|cross|up|down|arrow)\\.gif)~', '" . ' . $replace, $file);
+$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '', $file);
+$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);
$file = str_replace("../externals/jush/", "https://jush.svn.sourceforge.net/svnroot/jush/trunk/", $file); // mixed-content warning if Adminer runs on HTTPS and external files on HTTP
$file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
$file = php_shrink($file);
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 18ac631b..60fb4ad6 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -118,7 +118,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
}
}
if ($field["full_type"] == "tinyint(1)" && $return != " ") { // bool
- $return = '