Merge remote branch 'origin/master'

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

libraries/select_lang.lib.php

@@ -343,10 +343,8 @@ function PMA_langList()
 
     /* Open the directory */
     $handle = @opendir($GLOBALS['lang_path']);
+    /* This can happen if the kit is English-only */
     if ($handle === FALSE) {
-        trigger_error('phpMyAdmin: path not found: '
-            . $GLOBALS['lang_path'] . ', check your language directory.',
-            E_USER_WARNING);
         return $result;
     }
 
@@ -363,7 +361,7 @@ function PMA_langList()
 }
 
 /**
- * @global string  path to the translations directory
+ * @global string  path to the translations directory; may be absent if the kit is English-only
  */
 $GLOBALS['lang_path'] = './locale/';
 

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)) {