Always flush in navigation because table_status can take long

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@849 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 1fa1a40961db3b2abf523514fb1499ae57e1dee9..3e16210fb259920776a00e9a316ae6e08a2fb0bb 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -84,6 +84,8 @@ function adminer_message_query($query) {
 function adminer_navigation($missing) {
        global $SELF;
        if (call_adminer('navigation', true, $missing) && $missing != "auth") {
+               ob_flush();
+               flush();
                $databases = get_databases();
                ?>
 <form action="" method="post">

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index f2449a7503accbf3e0cd8407c109db7c8be1da90..a437765111cb04d2770602cf1e3caf5294428cdc 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -201,14 +201,10 @@ function connect() {
        return $dbh->error;
 }
 
-function get_databases($flush = true) {
+function get_databases() {
        // SHOW DATABASES can take a very long time so it is cached
        $return = &$_SESSION["databases"][$_GET["server"]];
        if (!isset($return)) {
-               if ($flush) {
-                       ob_flush();
-                       flush();
-               }
                $return = get_vals("SHOW DATABASES");
        }
        return $return;

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index b866ed315c7bba08ee35cff08481e6967eee51c6..a5a113d8d9ed5b7385cca79e0841e87184d55eee 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -8,7 +8,7 @@ function adminer_credentials() {
 }
 
 function adminer_database() {
-       $dbs = get_databases(false);
+       $dbs = get_databases();
        return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test')));
 }