From 39725e9dfb55cf57672d51cb98b36331c7417f1b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 4 Jul 2008 14:36:18 +0000 Subject: [PATCH] bug #1982489 [relation] Relationship view should check for changes --- ChangeLog | 1 + tbl_relation.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 284ed5dd5..38e982085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1992628 [parser] SQL parser removes essential space - bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes - bug #1959855 [interface] Font size option problem when no config file +- bug #1982489 [relation] Relationship view should check for changes 2.11.7.0 (2008-06-23) - bug #1908719 [interface] New field cannot be auto-increment and primary key diff --git a/tbl_relation.php b/tbl_relation.php index 4d13362e9..c1c11a549 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -163,8 +163,8 @@ if (isset($_REQUEST['destination_innodb'])) { // end repeated code } elseif (($existrel_innodb[$master_field]['foreign_db'] . '.' .$existrel_innodb[$master_field]['foreign_table'] . '.' . $existrel_innodb[$master_field]['foreign_field'] != $foreign_string) - || ($_REQUEST['on_delete'][$master_field] != (!empty($existrel_innodb[$master_field]['on_delete']) ? $existrel_innodb[$master_field]['on_delete'] : '')) - || ($_REQUEST['on_update'][$master_field] != (!empty($existrel_innodb[$master_field]['on_update']) ? $existrel_innodb[$master_field]['on_update'] : '')) + || ($_REQUEST['on_delete'][$master_field] != (!empty($existrel_innodb[$master_field]['on_delete']) ? $existrel_innodb[$master_field]['on_delete'] : 'nix')) + || ($_REQUEST['on_update'][$master_field] != (!empty($existrel_innodb[$master_field]['on_update']) ? $existrel_innodb[$master_field]['on_update'] : 'nix')) ) { // another foreign key is already defined for this field // or