From 1b6073b8009a14cab1730145da3eaa07e0056b22 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 27 Jan 2009 18:26:30 +0000 Subject: [PATCH] patch #2538358 [display] Conditions for relational display field --- ChangeLog | 2 ++ libraries/display_tbl.lib.php | 2 +- libraries/relation.lib.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a37e6ceb6..e313371a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Giovanni Giacobbi - themnemonic - bug [display] Message "Bookmark created" is not displaying + [display] Show AUTO_INCREMENT instead of A_I when in vertical mode +- patch #2538358 [display] Conditions for relational display field, + thanks to Virsacer - virsacer 3.1.2.0 (2009-01-19) - bug #1253252 [display] Can't NULL a column with relation defined diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index bd628546f..0f6c13bec 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -554,7 +554,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ PMA_generate_html_radio('display_text', $choices, $_SESSION['userconf']['display_text']); echo ''; - if ($GLOBALS['cfgRelation']['relwork']) { + if ($GLOBALS['cfgRelation']['relwork'] && $GLOBALS['cfgRelation']['displaywork']) { echo '
'; $choices = array( 'K' => $GLOBALS['strRelationalKey'], diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 50a9b4137..b2c5bd77e 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -117,7 +117,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) PMA_printDiagMessageForFeature('strGeneralRelationFeat', 'relwork', $messages); - PMA_printDiagMessageForParameter('table_info', isset($cfgRelation['displaywork']), $messages, 'table_info'); + PMA_printDiagMessageForParameter('table_info', $cfgRelation['displaywork'], $messages, 'table_info'); PMA_printDiagMessageForFeature('strDisplayFeat', 'displaywork', $messages);