[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1130-g1199f7a

Marc Delisle lem9 at users.sourceforge.net
Sun Nov 28 14:18:19 CET 2010


The branch, master has been updated
       via  1199f7a3db301ef7b0bd20ef0d3805fd3415be9b (commit)
       via  ae764b973f6f07019824ab4a109f6cde96adec0e (commit)
       via  36337ff8deec0271ea98d9e5495ddc753cbbe4b7 (commit)
       via  412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit)
      from  0d6cc8ca55a278ae4f2b671f33ae5029701fe705 (commit)


- Log -----------------------------------------------------------------
commit 1199f7a3db301ef7b0bd20ef0d3805fd3415be9b
Merge: 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 ae764b973f6f07019824ab4a109f6cde96adec0e
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Nov 28 08:16:37 2010 -0500

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    2 ++
 navigation.php |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f01a96b..04aa753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,8 @@
 - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
 + rfe #3111455 [interface] Column highlighting and marking in table view
 + Visual query builder
+- patch #3112792 [navi] Left panel table grouping incorrect,
+  thanks to garas - garas
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
diff --git a/navigation.php b/navigation.php
index bebdb19..a45277c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false,
             echo '</li>' . "\n";
         } elseif (is_array($table)) {
             // the table was not grouped because it is the only one with its prefix
-            if (isset($table['is' . $sep . 'group'])) {
+            while (isset($table['is' . $sep . 'group'])) {
                 // get the array with the actual table information
                 foreach ($table as $value) {
                     if(is_array($value)) {


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list