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

Comments now work for multi table selects (bug #789647).

Browse Source
This commit is contained in:
Michal Čihař
2004-10-20 13:11:35 +00:00
parent 08d0eeafe7
commit 162ee18db3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -13,6 +13,8 @@ $Source$
* lang/czech: Update. * lang/czech: Update.
* tbl_relation.php: Backquote table name (bug #1050441). * tbl_relation.php: Backquote table name (bug #1050441).
* db_details_qbe.php: Backquote table name. * db_details_qbe.php: Backquote table name.
* libraries/display_tbl.lib.php: Comments now work for multi table selects
(bug #789647).
2004-10-19 Marc Delisle <lem9@users.sourceforge.net> 2004-10-19 Marc Delisle <lem9@users.sourceforge.net>
* libraries/database_interface.lib.php: bug #1041667, correctly * libraries/database_interface.lib.php: bug #1041667, correctly

14
libraries/display_tbl.lib.php
View File

@@ -690,9 +690,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.0.1 Prepare Display column comments if enabled ($cfg['ShowBrowseComments']). // 2.0.1 Prepare Display column comments if enabled ($cfg['ShowBrowseComments']).
// Do not show comments, if using horizontalflipped mode, because of space usage // Do not show comments, if using horizontalflipped mode, because of space usage
if ($GLOBALS['cfg']['ShowBrowseComments'] && $GLOBALS['cfgRelation']['commwork'] && $disp_direction != 'horizontalflipped') { if ($GLOBALS['cfg']['ShowBrowseComments'] && $GLOBALS['cfgRelation']['commwork'] && $disp_direction != 'horizontalflipped') {
$comments_map = PMA_getComments($db, $table);
} else {
$comments_map = array(); $comments_map = array();
foreach ($analyzed_sql[0]['table_ref'] as $tbl) {
$tb = $tbl['table_true_name'];
$comments_map[$tb] = PMA_getComments($db, $tb);
}
} }
if ($GLOBALS['cfgRelation']['commwork'] && $GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if ($GLOBALS['cfgRelation']['commwork'] && $GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
@@ -732,11 +736,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
} }
// 2.0 Prepare comment-HTML-wrappers for each row, if defined/enabled. // 2.0 Prepare comment-HTML-wrappers for each row, if defined/enabled.
if (isset($comments_map[$fields_meta[$i]->name])) { if (isset($comments_map) &&
isset($comments_map[$fields_meta[$i]->table]) &&
isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) {
/*$comments_table_wrap_pre = '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><th>'; /*$comments_table_wrap_pre = '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><th>';
$comments_table_wrap_post = '</th></tr><tr><th style="font-size: 8pt; font-weight: normal">' . htmlspecialchars($comments_map[$fields_meta[$i]->name]) . '</td></tr></table>';*/ $comments_table_wrap_post = '</th></tr><tr><th style="font-size: 8pt; font-weight: normal">' . htmlspecialchars($comments_map[$fields_meta[$i]->name]) . '</td></tr></table>';*/
$comments_table_wrap_pre = ''; $comments_table_wrap_pre = '';
$comments_table_wrap_post = '<span class="tblcomment">' . htmlspecialchars($comments_map[$fields_meta[$i]->name]) . '</span>'; $comments_table_wrap_post = '<span class="tblcomment">' . htmlspecialchars($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name]) . '</span>';
} else { } else {
$comments_table_wrap_pre = ''; $comments_table_wrap_pre = '';
$comments_table_wrap_post = ''; $comments_table_wrap_post = '';