From a19804dc5ccc2c1689b65089dc3c8eb2f247a187 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 2 Sep 2014 18:18:58 -0400 Subject: [PATCH 1/2] Remove dead code Signed-off-by: Marc Delisle --- libraries/tbl_printview.lib.php | 3 +-- tbl_printview.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/tbl_printview.lib.php b/libraries/tbl_printview.lib.php index 41fd168a3a..4b81e9e184 100644 --- a/libraries/tbl_printview.lib.php +++ b/libraries/tbl_printview.lib.php @@ -516,13 +516,12 @@ function PMA_getHtmlForTableStructure( * @param string $db database name * @param array $cfg global config * @param array $cfgRelation config from PMA_getRelationsParam - * @param array $pk_array primary key array * @param int $cell_align_left cell align left * * @return string */ function PMA_getHtmlForTablesDetail( - $the_tables, $db, $cfg, $cfgRelation, $pk_array, $cell_align_left + $the_tables, $db, $cfg, $cfgRelation, $cell_align_left ) { $html = ''; $tables_cnt = count($the_tables); diff --git a/tbl_printview.php b/tbl_printview.php index fd500eaf46..725c2fb9e8 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -59,7 +59,6 @@ $response->addHTML(PMA_getHtmlForTablesInfo($the_tables)); $response->addHTML( PMA_getHtmlForTablesDetail( $the_tables, $db, $cfg, $cfgRelation, - isset($pk_array)? $pk_array: array(), $cell_align_left ) ); From bfd832b2da137df7fb8152e7debd0f82e95a4732 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 2 Sep 2014 18:21:12 -0400 Subject: [PATCH 2/2] Fix parameter type Signed-off-by: Marc Delisle --- libraries/tbl_printview.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tbl_printview.lib.php b/libraries/tbl_printview.lib.php index 4b81e9e184..cbd2db4703 100644 --- a/libraries/tbl_printview.lib.php +++ b/libraries/tbl_printview.lib.php @@ -445,7 +445,7 @@ function PMA_getHtmlForSpaceUsageAndRowStatistics( * return html for Table Structure * * @param bool $have_rel whether have relation - * @param array $tbl_is_view Is a table view? + * @param bool $tbl_is_view Is a table view? * @param array $columns columns list * @param array $analyzed_sql analyzed sql * @param array $res_rel relations array