From b3bcdf55eeb3005144e654eee8da85a513188448 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 7 Sep 2014 09:40:02 -0400 Subject: [PATCH] Remove unused parameter Signed-off-by: Marc Delisle --- libraries/insert_edit.lib.php | 3 +-- tbl_replace.php | 2 +- test/libraries/PMA_insert_edit_test.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 6d68b80ba8..dad37a8af1 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -2039,7 +2039,6 @@ function PMA_getWarningMessages() * Column to display from the foreign table? * * @param string $where_comparison string that contain relation field value - * @param string $relation_field_value relation field value * @param array $map all Relations to foreign tables for a given * table or optionally a given column in a table * @param string $relation_field relation field @@ -2047,7 +2046,7 @@ function PMA_getWarningMessages() * @return string $dispval display value from the foreign table */ function PMA_getDisplayValueForForeignTableColumn($where_comparison, - $relation_field_value, $map, $relation_field + $map, $relation_field ) { $foreigner = PMA_searchColumnInForeigners($map, $relation_field); $display_field = PMA_getDisplayField( diff --git a/tbl_replace.php b/tbl_replace.php index 37bac523ef..4fa4b17497 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -379,7 +379,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) { foreach ($curr_rel_field as $relation_field => $relation_field_value) { $where_comparison = "='" . $relation_field_value . "'"; $dispval = PMA_getDisplayValueForForeignTableColumn( - $where_comparison, $relation_field_value, $map, $relation_field + $where_comparison, $map, $relation_field ); $extra_data['relations'][$cell_index] diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 80a944b743..cbb66a4fcd 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -2332,7 +2332,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['dbi'] = $dbi; - $result = PMA_getDisplayValueForForeignTableColumn("=1", null, $map, 'f'); + $result = PMA_getDisplayValueForForeignTableColumn("=1", $map, 'f'); $this->assertEquals(2, $result); }