Don't flush before sending headers

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

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 820aec0a301a9388637d46bab30525a2e7f29a68..f2449a7503accbf3e0cd8407c109db7c8be1da90 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -201,12 +201,14 @@ function connect() {
        return $dbh->error;
 }
 
-function get_databases() {
-       // SHOW DATABASES can take very long so it is cached
+function get_databases($flush = true) {
+       // SHOW DATABASES can take a very long time so it is cached
        $return = &$_SESSION["databases"][$_GET["server"]];
        if (!isset($return)) {
-               ob_flush();
-               flush();
+               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 a5a113d8d9ed5b7385cca79e0841e87184d55eee..b866ed315c7bba08ee35cff08481e6967eee51c6 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();
+       $dbs = get_databases(false);
        return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test')));
 }