diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php index 0ee65aa190..f06a80d52d 100644 --- a/libraries/normalization.lib.php +++ b/libraries/normalization.lib.php @@ -79,8 +79,7 @@ function PMA_getHtmlForCreateNewColumn( $available_mime = array(); $mime_map = array(); $header_cells = PMA_getHeaderCells( - true, null, - $cfgRelation['mimework'], $db, $table + true, null, $cfgRelation['mimework'] ); if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { $mime_map = PMA_getMIME($db, $table); diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 8f3cafb4e4..dd5fceacfd 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -75,7 +75,7 @@ if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { $header_cells = PMA_getHeaderCells( $is_backup, isset($fields_meta) ? $fields_meta : null, - $cfgRelation['mimework'], $db, $table + $cfgRelation['mimework'] ); // workaround for field_fulltext, because its submitted indices contain diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 0c72b2bb10..3c3565c710 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -284,12 +284,10 @@ function PMA_getHtmlForTableCreateOrAddField($action, $form_params, $content_cel * @param bool $is_backup whether backup or not * @param array|null $columnMeta column meta data * @param bool $mimework whether mimework or not - * @param string $db current database - * @param string $table current table * * @return array */ -function PMA_getHeaderCells($is_backup, $columnMeta, $mimework, $db, $table) +function PMA_getHeaderCells($is_backup, $columnMeta, $mimework) { $header_cells = array(); $header_cells[] = __('Name'); diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php index f193651e3a..69a719005d 100644 --- a/test/libraries/PMA_tbl_columns_definition_form_test.php +++ b/test/libraries/PMA_tbl_columns_definition_form_test.php @@ -359,7 +359,7 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['BrowseMIME'] = true; $GLOBALS['cfg']['ShowHint'] = false; - $result = PMA_getHeaderCells(false, array(), true, 'db', 'table'); + $result = PMA_getHeaderCells(false, array(), true); $this->assertContains( 'Index',