diff options
| -rw-r--r-- | libraries/insert_edit.lib.php | 13 | ||||
| -rw-r--r-- | tbl_change.php | 3 | ||||
| -rw-r--r-- | test/libraries/PMA_insert_edit_test.php | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 83c2dae5ef..e77a43a935 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -584,7 +584,7 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData) * @param array $foreignData data about the foreign keys * @param boolean $odd_row whether row is odd * @param array $paramTableDbArray array containing $table and $db - * @param array $rownumber_param &rownumber=row_id + * @param array $rownumber the row number * @param array $titles An HTML IMG tag for a particular icon from * a theme, which may be an actual file or * an icon from a sprite @@ -607,7 +607,7 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData) */ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data, - $special_chars, $foreignData, $odd_row, $paramTableDbArray, $rownumber_param, + $special_chars, $foreignData, $odd_row, $paramTableDbArray, $rownumber, $titles, $text_dir, $special_chars_encoded, $vkey, $is_upload, $biggest_max_file_size, $default_char_editing, $no_support_types, $gis_data_types, $extracted_columnspec @@ -618,7 +618,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, $html_output .= PMA_getForeignLink( $column, $backup_field, $column_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data, - $paramTableDbArray, $rownumber_param, $titles + $paramTableDbArray, $rownumber, $titles ); } elseif (is_array($foreignData['disp_row'])) { @@ -705,7 +705,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, * @param integer $idindex id index * @param array $data data to edit * @param array $paramTableDbArray array containing $table and $db - * @param array $rownumber_param &rownumber=row_id + * @param array $rownumber the row number * @param array $titles An HTML IMG tag for a particular icon from * a theme, which may be an actual file or * an icon from a sprite @@ -714,7 +714,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix, */ function PMA_getForeignLink($column, $backup_field, $column_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data, - $paramTableDbArray, $rownumber_param, $titles + $paramTableDbArray, $rownumber, $titles ) { list($table, $db) = $paramTableDbArray; $html_output = ''; @@ -738,7 +738,8 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix, array( 'db' => $db, 'table' => $table, - 'field' => $column['Field'] . $rownumber_param + 'field' => $column['Field'], + 'rownumber' => $rownumber ) ) . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>'; diff --git a/tbl_change.php b/tbl_change.php index 11476ee7d0..cf11fbcfb4 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -165,7 +165,6 @@ foreach ($rows as $row_id => $current_row) { } $jsvkey = $row_id; - $rownumber_param = '&rownumber=' . $row_id; $vkey = '[multi_edit][' . $jsvkey . ']'; $current_result = (isset($result) && is_array($result) && isset($result[$row_id]) @@ -303,7 +302,7 @@ foreach ($rows as $row_id => $current_row) { $html_output .= PMA_getValueColumn( $column, $backup_field, $column_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data, $special_chars, - $foreignData, $odd_row, array($table, $db), $rownumber_param, $titles, + $foreignData, $odd_row, array($table, $db), $row_id, $titles, $text_dir, $special_chars_encoded, $vkey, $is_upload, $biggest_max_file_size, $default_char_editing, $no_support_types, $gis_data_types, $extracted_columnspec diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 590ae3e640..099980fd7b 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -712,7 +712,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $titles['Browse'] = "'"; $GLOBALS['cfg']['ServerDefault'] = 2; $result = PMA_getForeignLink( - $column, 'a', 'b', 'd', 2, 0, 1, "<s>", array('tbl', 'db'), 1, $titles + $column, 'a', 'b', 'd', 2, 0, 1, "<s>", array('tbl', 'db'), 8, $titles ); $this->assertTag( @@ -727,7 +727,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase '<a class="foreign_values_anchor" target="_blank" onclick=' . '"window.open(this.href,\'foreigners\', \'width=640,height=240,' . 'scrollbars=yes,resizable=yes\'); return false;" href="browse_' - . 'foreigners.php?db=db&table=tbl&field=f1&server=1' + . 'foreigners.php?db=db&table=tbl&field=f&rownumber=8&server=1' . '&lang=en&token=token">', array('content' => "\\'") ), |