gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-07-31 15:02:00 +02:00
commit 6c2b535f10
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mult_submits.inc.php
View File

@ -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

3
libraries/mult_submits.lib.php
View File

@ -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;

5
test/libraries/PMA_mult_submits_test.php
View File

@ -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