From d8ec2af1588c5d5a7bc6a4847b99170b5e99e126 Mon Sep 17 00:00:00 2001 From: Ashutosh Dhundhara Date: Fri, 1 Aug 2014 23:02:43 +0530 Subject: [PATCH] Allow foreign key creation with empty columns. Signed-off-by: Ashutosh Dhundhara --- libraries/tbl_relation.lib.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 1b8c7a86a1..9a23d5bbc9 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -1026,8 +1026,17 @@ function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_m } $empty_fields = false; - if (in_array('', $master_field) || in_array('', $foreign_field)) { - $empty_fields = true; + foreach ($master_field as $key => $one_field) { + if ((! empty($one_field) && empty($foreign_field[$key])) + || (empty($one_field) && ! empty($foreign_field[$key])) + ) { + $empty_fields = true; + } + + if (empty($one_field) && empty($foreign_field[$key])) { + unset($master_field[$key]); + unset($foreign_field[$key]); + } } if (! empty($foreign_db)