diff --git a/adminer/db.inc.php b/adminer/db.inc.php index 4fae3bad..1cb76ebd 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -125,7 +125,7 @@ if ($adminer->homepage()) { : ""))) . (support("table") ? " " : "") . "\n"; - $databases = (support("scheme") ? schemas() : $adminer->databases()); + $databases = (support("scheme") ? $adminer->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/include/adminer.inc.php b/adminer/include/adminer.inc.php index 144ff346..787fec8b 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -43,6 +43,13 @@ class Adminer { return get_databases($flush); } + /** Get list of schemas + * @return array + */ + function schemas() { + return schemas(); + } + /** Specify limit for waiting on some slow queries like DB list * @return float number of seconds */ @@ -806,7 +813,7 @@ username.form['auth[driver]'].onchange(); * @return null */ function databasesPrint($missing) { - global $connection; + global $adminer, $connection; $databases = $this->databases(); ?>

@@ -821,7 +828,7 @@ username.form['auth[driver]'].onchange(); echo "\n"; if ($missing != "db" && DB != "" && $connection->select_db(DB)) { if (support("scheme")) { - echo "
"; + echo "
"; if ($_GET["ns"] != "") { set_schema($_GET["ns"]); } diff --git a/changes.txt b/changes.txt index d3bcfa55..adea07ce 100644 --- a/changes.txt +++ b/changes.txt @@ -21,6 +21,7 @@ SQLite: Allow editing primary key SQLite: Allow editing foreign keys PostgreSQL: Fix handling of nextval() default values PostgreSQL: Support creating array columns +Customization: Provide schemas() Thai translation Adminer 3.7.1 (released 2013-06-29): diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index 94c9b749..2f8bcb98 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -28,6 +28,10 @@ class Adminer { } } + function schemas() { + return schemas(); + } + function databases($flush = true) { return get_databases($flush); } diff --git a/plugins/plugin.php b/plugins/plugin.php index 0137b6b3..c0a0bd5b 100644 --- a/plugins/plugin.php +++ b/plugins/plugin.php @@ -107,6 +107,11 @@ class AdminerPlugin extends Adminer { return $this->_applyPlugin(__FUNCTION__, $args); } + function schemas() { + $args = func_get_args(); + return $this->_applyPlugin(__FUNCTION__, $args); + } + function databases() { $args = func_get_args(); return $this->_applyPlugin(__FUNCTION__, $args);