diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 46d3f79b7a..7a8a731ca2 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -170,7 +170,7 @@ if (!empty($submit_mult) && !empty($what)) { // Builds the query list($full_query, $reload, $full_query_views) = PMA_getQueryFromSelected( - $what, $db, $table, $selected, $views + $what, $table, $selected, $views ); // Displays the confirmation form diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php index 1c1dc60768..6f18a57b92 100644 --- a/libraries/mult_submits.lib.php +++ b/libraries/mult_submits.lib.php @@ -529,14 +529,13 @@ function PMA_getDataForSubmitMult($submit_mult, $db, $table, $selected, $action) * Get query string from Selected * * @param string $what mult_submit type - * @param string $db database name * @param string $table table name * @param array $selected the selected columns * @param array $views table views * * @return array */ -function PMA_getQueryFromSelected($what, $db, $table, $selected, $views) +function PMA_getQueryFromSelected($what, $table, $selected, $views) { $reload = false; $full_query_views = null; diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php index f8b3dc00e4..eab3286d3d 100644 --- a/test/libraries/PMA_mult_submits_test.php +++ b/test/libraries/PMA_mult_submits_test.php @@ -433,7 +433,6 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase public function testPMAGetQueryFromSelected() { $what = "drop_tbl"; - $db = "PMA_db"; $table = "PMA_table"; $selected = array( "table1", "table2" @@ -444,7 +443,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase list($full_query, $reload, $full_query_views) = PMA_getQueryFromSelected( - $what, $db, $table, $selected, $views + $what, $table, $selected, $views ); //validate 1: $full_query @@ -469,7 +468,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase list($full_query, $reload, $full_query_views) = PMA_getQueryFromSelected( - $what, $db, $table, $selected, $views + $what, $table, $selected, $views ); //validate 1: $full_query