diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 062ca31119..d63a27cca3 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2732,7 +2732,7 @@ class PMA_DisplayResults $table_body_html .= $this->_getPlacedLinks( self::POSITION_LEFT, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, - $del_query, 'l', $edit_url, $copy_url, $edit_anchor_class, + $del_query, $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf ); @@ -2743,7 +2743,7 @@ class PMA_DisplayResults $table_body_html .= $this->_getPlacedLinks( self::POSITION_NONE, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, - $del_query, 'l', $edit_url, $copy_url, $edit_anchor_class, + $del_query, $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf ); @@ -2766,7 +2766,7 @@ class PMA_DisplayResults $table_body_html .= $this->_getPlacedLinks( self::POSITION_RIGHT, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, - $del_query, 'r', $edit_url, $copy_url, $edit_anchor_class, + $del_query, $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf ); @@ -3584,7 +3584,6 @@ class PMA_DisplayResults * @param string $where_clause_html the html encoded where clause * @param array $condition_array array of keys (primary, unique, condition) * @param string $del_query the query for delete row - * @param string $dir_letter the letter denoted the direction * @param string $edit_url the url for edit row * @param string $copy_url the url for copy row * @param string $edit_anchor_class the class for html element for edit @@ -3601,7 +3600,7 @@ class PMA_DisplayResults */ private function _getPlacedLinks( $dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, - $condition_array, $del_query, $dir_letter, $edit_url, $copy_url, + $condition_array, $del_query, $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf ) { diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index db3d71ce4c..687c87434b 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1344,7 +1344,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase '`new`.`id`' => '= 1', ), 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', - 'l', 'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60' . 'id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+' . '%60new%60&goto=sql.php&default_action=update&token=' @@ -1381,7 +1380,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase * @param string $where_clause_html the html encoded where clause * @param array $condition_array array of keys (primary, unique, condition) * @param string $del_query the query for delete row - * @param string $dir_letter the letter denoted the direction * @param string $edit_url the url for edit row * @param string $copy_url the url for copy row * @param string $edit_anchor_class the class for html element for edit @@ -1397,7 +1395,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase */ public function testGetPlacedLinks( $dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, - $condition_array, $del_query, $dir_letter, $edit_url, $copy_url, + $condition_array, $del_query, $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output ) { $this->assertEquals( @@ -1407,7 +1405,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase array( $dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, $del_query, - $dir_letter, $edit_url, $copy_url, $edit_anchor_class, + $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf ) )