From ff358717e4b06bf3f58fc5ba23d0bb40b9ee51af Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 5 Sep 2015 05:43:21 -0400 Subject: [PATCH] Fix invalid argument supplied for foreach() Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/tbl_relation.lib.php | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba10a656fa..596d955528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #11451 Designer-Bug in move.js on multiple server configuration - issue #11458 Invalid UTF-8 sequence in argument - issue #11457 Request URI too large +- issue Invalid argument supplied for foreach() 4.4.14.0 (2015-08-20) - issue #11367 Export after search, missing WHERE clause diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 400ddf2e4e..a7ab588cbb 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -384,12 +384,14 @@ function PMA_getHtmlForForeignKeyForm($columns, $existrel_foreign, $db, $odd_row = true; $i = 0; - foreach ($existrel_foreign as $key => $one_key) { - $html_output .= PMA_getHtmlForForeignKeyRow( - $one_key, $odd_row, $columns, $i++, $options_array, $tbl_storage_engine, - $db - ); - $odd_row = ! $odd_row; + if (! empty($existrel_foreign)) { + foreach ($existrel_foreign as $key => $one_key) { + $html_output .= PMA_getHtmlForForeignKeyRow( + $one_key, $odd_row, $columns, $i++, $options_array, + $tbl_storage_engine, $db + ); + $odd_row = ! $odd_row; + } } $html_output .= PMA_getHtmlForForeignKeyRow( array(), $odd_row, $columns, $i++, $options_array, $tbl_storage_engine,