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

more complete check before showing Relation View

Browse Source
This commit is contained in:
Marc Delisle
2006-08-14 11:28:11 +00:00
parent d45bd5bbaf
commit 1a96a3159d
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-14 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php: more complete check before showing
Relation View
2006-08-13 Marc Delisle <lem9@users.sourceforge.net> 2006-08-13 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: bug #1519799, imagelink error * libraries/display_tbl.lib.php: bug #1519799, imagelink error
* tbl_select.php: feature #1520222, calendar in Search * tbl_select.php: feature #1520222, calendar in Search

15
tbl_properties_structure.php
View File

@@ -4,6 +4,13 @@
require_once './libraries/common.lib.php'; require_once './libraries/common.lib.php';
require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/relation.lib.php';
/**
* Gets the relation settings
*/
$cfgRelation = PMA_getRelationsParam();
/** /**
* Drop multiple fields if required * Drop multiple fields if required
@@ -531,11 +538,11 @@ echo $strPrintView;
?></a> ?></a>
<?php <?php
if (! $tbl_is_view && ! $db_is_information_schema) { if (! $tbl_is_view && ! $db_is_information_schema) {
// if internal relations are available, or the table type is INNODB
// ($tbl_type comes from libraries/tbl_properties_table_info.inc.php)
if ($cfg['Server']['relation'] || $tbl_type=="INNODB") { // if internal relations are available, or the table type is INNODB
// ($tbl_type comes from libraries/tbl_properties_table_info.inc.php)
if ($cfgRelation['relwork'] || $tbl_type=="INNODB") {
?> ?>
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
if ($cfg['PropertiesIconic']) { if ($cfg['PropertiesIconic']) {