diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 32668eb12cae..38e96b4c9a14 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -170,14 +170,14 @@ function PMA_generateRelationalDropdown( /** * Function to get html for the common form * - * @param string $db current database - * @param string $table current table - * @param array $columns columns - * @param array $cfgRelation configuration relation - * @param string $tbl_storage_engine table storage engine - * @param array|null $existrel db, table, column - * @param array|null $existrel_foreign db, table, column - * @param array $options_array options array + * @param string $db current database + * @param string $table current table + * @param array $columns columns + * @param array $cfgRelation configuration relation + * @param string $tbl_storage_engine table storage engine + * @param array $existrel db, table, column + * @param array $existrel_foreign db, table, column + * @param array $options_array options array * * @return string */ diff --git a/tbl_relation.php b/tbl_relation.php index 77aca0daee45..fdd959373bf1 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -154,7 +154,7 @@ $html_output .= PMA_getHtmlForCommonForm( $db, $table, $columns, $cfgRelation, $tbl_storage_engine, isset($existrel) ? $existrel : array(), - isset($existrel_foreign) ? $existrel_foreign['foreign_keys_data'] : null, + isset($existrel_foreign) ? $existrel_foreign['foreign_keys_data'] : array(), $options_array );