nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-11-28 08:15:53 -05:00
parent 36337ff8de
commit ae764b973f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -122,6 +122,8 @@
- bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
+ rfe #3111455 [interface] Column highlighting and marking in table view + rfe #3111455 [interface] Column highlighting and marking in table view
+ Visual query builder + Visual query builder
- patch #3112792 [navi] Left panel table grouping incorrect,
thanks to garas - garas
3.3.9.0 (not yet released) 3.3.9.0 (not yet released)
- bug [doc] Fix references to MySQL doc - bug [doc] Fix references to MySQL doc

2
navigation.php
View File

@@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false,
echo '</li>' . "\n"; echo '</li>' . "\n";
} elseif (is_array($table)) { } elseif (is_array($table)) {
// the table was not grouped because it is the only one with its prefix // 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 // get the array with the actual table information
foreach ($table as $value) { foreach ($table as $value) {
if(is_array($value)) { if(is_array($value)) {