diff --git a/adminer/db.inc.php b/adminer/db.inc.php index e618bb90..24c587f4 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -92,7 +92,7 @@ if ($adminer->homepage()) { echo "\n"; if (!information_schema(DB)) { echo "
" . ($jush == "sql" ? " " : "") . " \n"; // 1 - eventStop - $databases = (support("scheme") ? schemas() : get_databases()); + $databases = (support("scheme") ? schemas() : $adminer->databases()); if (count($databases) != 1 && $jush != "sqlite") { $db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB)); echo "
" . lang('Move to other database') . ": ";
diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index c10b84b5..749e83fe 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -208,7 +208,7 @@ if (DB != "") {
echo $views;
} else {
echo " \n";
- $databases = get_databases();
+ $databases = $adminer->databases();
if ($databases) {
foreach ($databases as $db) {
if (!information_schema($db)) {
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 57886880..97b81e0b 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -34,6 +34,14 @@ class Adminer {
return DB;
}
+ /** Get cached list of databases
+ * @param bool
+ * @return array
+ */
+ function databases($flush = true) {
+ return get_databases($flush);
+ }
+
/** Headers to send before HTML output
* @return bool true to send security headers
*/
@@ -753,7 +761,7 @@ DROP PROCEDURE adminer_alter;
}
}
} else {
- $databases = get_databases();
+ $databases = $this->databases();
?>