From 9095aa88bf5e2c5dc4d3258044fd911fd028df42 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 29 Apr 2015 08:35:11 -0400 Subject: [PATCH 1/2] Fix parameter type Signed-off-by: Marc Delisle --- libraries/mult_submits.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php index 63d27148ff..3c0856149a 100644 --- a/libraries/mult_submits.lib.php +++ b/libraries/mult_submits.lib.php @@ -409,7 +409,7 @@ function PMA_getHtmlForAddPrefixTable($action, $_url_params) * @param string $what mult_submit type * @param string $action action type * @param array $_url_params URL params - * @param array $full_query full sql query string + * @param string $full_query full sql query string * * @return string */ From 99bef84f3a25dba8f260363ea9098d0bf72e9ea9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 29 Apr 2015 08:40:57 -0400 Subject: [PATCH 2/2] Remove unused code Signed-off-by: Marc Delisle --- test/libraries/PMA_mult_submits_test.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php index 1e79f9cef5..ce5572569a 100644 --- a/test/libraries/PMA_mult_submits_test.php +++ b/test/libraries/PMA_mult_submits_test.php @@ -284,7 +284,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase list( $result, $rebuild_database_list, $reload_ret, - $run_parts, $use_sql, $sql_query, $sql_query_views + $run_parts, $use_sql,, ) = PMA_getQueryStrFromSelected( $query_type, $selected, $db, $table, $views, $primary, $from_prefix, $to_prefix @@ -316,8 +316,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase $query_type = 'analyze_tbl'; list( - $result, $rebuild_database_list, $reload_ret, - $run_parts, $use_sql, $sql_query, $sql_query_views + ,,,, $use_sql,, ) = PMA_getQueryStrFromSelected( $query_type, $selected, $db, $table, $views, $primary, $from_prefix, $to_prefix