From c19dec2c478f04036c34add5d80311d19ef62eb0 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 9 May 2018 21:53:57 +0200 Subject: [PATCH] Revert modifications/error Signed-off-by: William Desportes --- libraries/classes/InsertEdit.php | 1 - libraries/classes/Relation.php | 3 +-- libraries/classes/Sql.php | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index cd6b7764cb..241eca1ff9 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -916,7 +916,6 @@ class InsertEdit . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"' . ' id="field_' . $idindex . '_3">'; $html_output .= $this->relation->foreignDropdown( - $column, $foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 99ca025f4a..2f182cb9bc 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -1286,7 +1286,6 @@ class Relation /** * Outputs dropdown with values of foreign fields * - * @param array $column description of column in given table * @param array $disp_row array of the displayed row * @param string $foreign_field the foreign field * @param string $foreign_display the foreign field to display @@ -1297,7 +1296,7 @@ class Relation * * @access public */ - public function foreignDropdown($column, array $disp_row, $foreign_field, $foreign_display, $data, + public function foreignDropdown(array $disp_row, $foreign_field, $foreign_display, $data, $max = null ) { if (null === $max) { diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 7483b73e4b..0a08857eb7 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -234,7 +234,6 @@ class Sql . ''; } else { $dropdown = $this->relation->foreignDropdown( - array( 'is_binary' => false ), $foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'],