From 062b408d0e45eef71c5b470b663883ff3fff2ee8 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Sat, 14 Jan 2006 18:00:59 +0000
Subject: [PATCH] PMA_getTableList(): added second parameter to pass tables (if
 already fetched from db)

---
 ChangeLog                |  2 ++
 libraries/common.lib.php | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e2ae519a..9d667df3b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ $Source$
     * libraries/sql_query_form.lib.php: undefined js variable
     * libraries/database_interface.lib.php: PMA_DBI_get_tables_full() first parameter
       now also accepts an array of database names not only a single name
+    * libraries/common.lib.php: PMA_getTableList():
+      added second parameter to pass tables (if already fetched from db)
 
 2006-01-12 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: typo, thanks to Cédric Corazza
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 21fce244f..0a3503a6c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1034,25 +1034,27 @@ if (!defined('PMA_MINIMUM_COMMON')) {
      * @param   string  $db     name of db
      * return   array   (rekursive) grouped table list
      */
-    function PMA_getTableList($db)
+    function PMA_getTableList($db, $tables = null)
     {
         $sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
 
-        $tables = PMA_DBI_get_tables_full($db);
+        if ( null === $tables ) {
+            $tables = PMA_DBI_get_tables_full($db);
+            if ($GLOBALS['cfg']['NaturalOrder']) {
+                uksort($tables, 'strnatcasecmp');
+            }
+        }
+        
         if (count($tables) < 1) {
             return $tables;
         }
 
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            uksort($tables, 'strnatcasecmp');
-        }
-
         $default = array(
             'Name'      => '',
             'Rows'      => 0,
             'Comment'   => '',
             'disp_name' => '',
-       );
+        );
 
         $table_groups = array();