gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused parameter

Browse Source 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
This commit is contained in:
Chanaka Dharmarathna 2014-09-17 00:04:01 +05:30
parent fe17e81299
commit 08e8ab1cda
2 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libraries/DisplayResults.class.php
View File

@ -2695,7 +2695,7 @@ class PMA_DisplayResults
$where_clause_html = urlencode($where_clause);
// In print view these variable needs to be initialized
$del_url = $del_query = $del_str = $edit_anchor_class
$del_url = $del_str = $edit_anchor_class
= $edit_str = $js_conf = $copy_url = $copy_str = $edit_url = null;
// 1.2 Defines the URLs for the modify/delete link(s)
@ -2716,7 +2716,7 @@ class PMA_DisplayResults
} // end if (1.2.1)
// 1.2.2 Delete/Kill link(s)
list($del_query, $del_url, $del_str, $js_conf)
list($del_url, $del_str, $js_conf)
= $this->_getDeleteAndKillLinks(
$where_clause, $clause_is_unique,
$url_sql_query, $is_display['del_lnk'],
@ -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, $edit_url, $copy_url, $edit_anchor_class,
$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, $edit_url, $copy_url, $edit_anchor_class,
$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, $edit_url, $copy_url, $edit_anchor_class,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
);
@ -2780,7 +2780,7 @@ class PMA_DisplayResults
// output
$this->_gatherLinksForLaterOutputs(
$row_no, $is_display, $where_clause, $where_clause_html, $js_conf,
$del_url, $del_query, $del_str, $edit_anchor_class, $edit_url,
$del_url, $del_str, $edit_anchor_class, $edit_url,
$edit_str, $copy_url, $copy_str, $alternating_color_class,
$condition_array
);
@ -3062,7 +3062,6 @@ class PMA_DisplayResults
* @param string $where_clause_html the html encoded where clause
* @param string $js_conf text for the JS confirmation
* @param string $del_url the url for delete row
* @param string $del_query the query for delete row
* @param string $del_str the label for delete row
* @param string $edit_anchor_class the class for html element for edit
* @param string $edit_url the url for edit row
@ -3081,7 +3080,7 @@ class PMA_DisplayResults
*/
private function _gatherLinksForLaterOutputs(
$row_no, $is_display, $where_clause, $where_clause_html, $js_conf,
$del_url, $del_query, $del_str, $edit_anchor_class, $edit_url, $edit_str,
$del_url, $del_str, $edit_anchor_class, $edit_url, $edit_str,
$copy_url, $copy_str, $alternating_color_class, $condition_array
) {
@ -3110,7 +3109,7 @@ class PMA_DisplayResults
$vertical_display['row_delete'][$row_no]
.= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html,
$condition_array, $del_query, '[%_PMA_CHECKBOX_DIR_%]',
$condition_array, '[%_PMA_CHECKBOX_DIR_%]',
$alternating_color_class . $vertical_class
);
@ -3442,7 +3441,7 @@ class PMA_DisplayResults
* @param string $del_lnk the delete link of current row
* @param array $row the current row
*
* @return array 4 element array - $del_query,
* @return array 3 element array
* $del_url, $del_str, $js_conf
*
* @access private
@ -3512,16 +3511,15 @@ class PMA_DisplayResults
);
$del_url = 'sql.php' . PMA_URL_getCommon($_url_params);
$del_query = $kill;
$js_conf = $kill;
$del_str = PMA_Util::getIcon(
'b_drop.png', __('Kill')
);
} else {
$del_url = $del_query = $del_str = $js_conf = null;
$del_url = $del_str = $js_conf = null;
}
return array($del_query, $del_url, $del_str, $js_conf);
return array($del_url, $del_str, $js_conf);
} // end of the '_getDeleteAndKillLinks()' function
@ -3582,7 +3580,6 @@ class PMA_DisplayResults
* @param string $where_clause the where clause of the sql
* @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 $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
@ -3599,7 +3596,7 @@ class PMA_DisplayResults
*/
private function _getPlacedLinks(
$dir, $del_url, $is_display, $row_no, $where_clause, $where_clause_html,
$condition_array, $del_query, $edit_url, $copy_url,
$condition_array, $edit_url, $copy_url,
$edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf
) {
@ -3610,7 +3607,7 @@ class PMA_DisplayResults
return $this->_getCheckboxAndLinks(
$dir, $del_url, $is_display,
$row_no, $where_clause, $where_clause_html, $condition_array,
$del_query, 'l', $edit_url, $copy_url, $edit_anchor_class,
'l', $edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
);
@ -5771,7 +5768,6 @@ class PMA_DisplayResults
* @param string $row_no the row number
* @param string $where_clause_html url encoded where clause
* @param array $condition_array array of conditions in the where clause
* @param string $del_query delete query
* @param string $id_suffix suffix for the id
* @param string $class css classes for the td element
*
@ -5783,7 +5779,7 @@ class PMA_DisplayResults
*/
private function _getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_query, $id_suffix, $class
$id_suffix, $class
) {
$ret = '';
@ -5952,7 +5948,6 @@ class PMA_DisplayResults
* @param string $where_clause where clause
* @param string $where_clause_html url encoded where clause
* @param array $condition_array array of conditions in the where clause
* @param string $del_query delete query
* @param string $id_suffix suffix for the id
* @param string $edit_url edit url
* @param string $copy_url copy url
@ -5970,7 +5965,7 @@ class PMA_DisplayResults
*/
private function _getCheckboxAndLinks(
$position, $del_url, $is_display, $row_no, $where_clause,
$where_clause_html, $condition_array, $del_query, $id_suffix,
$where_clause_html, $condition_array, $id_suffix,
$edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf
) {
@ -5980,7 +5975,7 @@ class PMA_DisplayResults
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_query, $id_suffix = '_left', ''
$id_suffix = '_left', ''
);
$ret .= $this->_getEditLink(
@ -6007,14 +6002,14 @@ class PMA_DisplayResults
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_query, $id_suffix = '_right', ''
$id_suffix = '_right', ''
);
} else { // $position == self::POSITION_NONE
$ret .= $this->_getCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_query, $id_suffix = '_left', ''
$id_suffix = '_left', ''
);
}

20
test/classes/PMA_DisplayResults_test.php
View File

@ -809,7 +809,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
0,
'%60new%60.%60id%60+%3D+1',
array('`new`.`id`' => '= 1'),
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
'[%_PMA_CHECKBOX_DIR_%]',
'odd row_0 vpointer vmarker',
'<td class="odd row_0 vpointer vmarker" class="center"><input type'
@ -831,7 +830,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @param string $row_no the row number
* @param string $where_clause_html url encoded where clause
* @param array $condition_array array of conditions in the where clause
* @param string $del_query delete query
* @param string $id_suffix suffix for the id
* @param string $class css classes for the td element
* @param string $output output of _getCheckboxForMultiRowSubmissions
@ -842,7 +840,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
*/
public function testGetCheckboxForMultiRowSubmissions(
$del_url, $is_display, $row_no, $where_clause_html, $condition_array,
$del_query, $id_suffix, $class, $output
$id_suffix, $class, $output
) {
$this->assertEquals(
$output,
@ -850,7 +848,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
'_getCheckboxForMultiRowSubmissions',
array(
$del_url, $is_display, $row_no, $where_clause_html,
$condition_array, $del_query, $id_suffix, $class
$condition_array, $id_suffix, $class
)
)
);
@ -1082,7 +1080,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
array(
'`new`.`id`' => '= 1',
),
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
'l',
'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
. '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
@ -1161,7 +1158,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
array(
'`new`.`id`' => '= 1',
),
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
'l',
'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
. '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
@ -1238,7 +1234,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
array(
'`new`.`id`' => '= 1',
),
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
'l',
'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
. 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
@ -1276,7 +1271,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @param string $where_clause where clause
* @param string $where_clause_html url encoded where clause
* @param array $condition_array array of conditions in the where clause
* @param string $del_query delete query
* @param string $id_suffix suffix for the id
* @param string $edit_url edit url
* @param string $copy_url copy url
@ -1293,7 +1287,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
*/
public function testGetCheckboxAndLinks(
$position, $del_url, $is_display, $row_no, $where_clause,
$where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url,
$where_clause_html, $condition_array, $id_suffix, $edit_url,
$copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
) {
$this->assertEquals(
@ -1302,7 +1296,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
'_getCheckboxAndLinks',
array(
$position, $del_url, $is_display, $row_no, $where_clause,
$where_clause_html, $condition_array, $del_query,
$where_clause_html, $condition_array,
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
$copy_str, $del_str, $js_conf
)
@ -1343,7 +1337,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
array(
'`new`.`id`' => '= 1',
),
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
. 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
. '%60new%60&amp;goto=sql.php&amp;default_action=update&amp;token='
@ -1379,7 +1372,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
* @param string $where_clause the where clause of the sql
* @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 $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
@ -1395,7 +1387,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, $edit_url, $copy_url,
$condition_array, $edit_url, $copy_url,
$edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output
) {
$this->assertEquals(
@ -1404,7 +1396,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
'_getPlacedLinks',
array(
$dir, $del_url, $is_display, $row_no, $where_clause,
$where_clause_html, $condition_array, $del_query,
$where_clause_html, $condition_array,
$edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
)