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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-04-16 09:58:27 +02:00
parent 67fd7e2567 69dd779f40
commit 541c99c084
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

@@ -83,6 +83,8 @@ $Id$
thanks to Björn Wiberg - bwiberg thanks to Björn Wiberg - bwiberg
- bug #2983066 [interface] Flush table on table operations shows the query twice, - bug #2983066 [interface] Flush table on table operations shows the query twice,
thanks to Martynas Mickevičius - BlinK_ thanks to Martynas Mickevičius - BlinK_
- bug #2983060, patch #2987900 [interface] Fix initial state of tables in
designer, thanks to Sutharshan Balachandren.
3.3.2.0 (2010-04-13) 3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

2
pmd_general.php
View File

@@ -224,7 +224,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tr> </tr>
</thead> </thead>
<tbody id="id_tbody_<?php echo $t_n_url ?>" <tbody id="id_tbody_<?php echo $t_n_url ?>"
<?php if (! isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> <?php if ( isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>>
<?php <?php
$display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]); $display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]);
for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) { for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) {