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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-08-01 20:28:45 +02:00
commit 04492658aa
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/tbl_relation.lib.php
View File

@ -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)