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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Marc Delisle 2014-12-04 14:02:48 -05:00
commit 3062152abf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
- bug #4615 SQL highlighting in process list breaks on auto refresh
- bug #4616 Warning in db structure print view page
- bug Undefined index navwork, savedsearcheswork, fields
- bug #4620 Undefined index while adding to the central columns list
4.3.0.0 (not yet released)
+ rfe #1502 Smart sorting for int keys

4
libraries/central_columns.lib.php
View File

@ -201,7 +201,7 @@ function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
if (empty($cfgCentralColumns)) {
return PMA_configErrorMessage();
}
$db = $_POST['db'];
$db = $_REQUEST['db'];
$pmadb = $cfgCentralColumns['db'];
$central_list_table = $cfgCentralColumns['table'];
$GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
@ -235,7 +235,7 @@ function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
}
} else {
if ($table == null) {
$table = $_POST['table'];
$table = $_REQUEST['table'];
}
foreach ($field_select as $column) {
$cols .= "'" . PMA_Util::sqlAddSlashes($column) . "',";

6
test/libraries/PMA_central_columns_test.php
View File

@ -157,8 +157,8 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
public function testPMASyncUniqueColumns()
{
$field_select = array("col1");
$_POST['db'] = 'PMA_db';
$_POST['table'] = 'PMA_table';
$_REQUEST['db'] = 'PMA_db';
$_REQUEST['table'] = 'PMA_table';
$this->assertInstanceOf(
'PMA_Message', PMA_syncUniqueColumns($field_select, false)
);
@ -514,4 +514,4 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$result
);
}
}
}