Function does not handle null values even if it was documented to han…

…dle them Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Oct 4, 2014 · efa06c3 · efa06c3
1 parent 69cb461
commit efa06c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
 );