Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
This commit is contained in:
Chanaka Dharmarathna 2014-10-04 11:40:39 +05:30
parent 65791f5ecb
commit 4e68ada908
6 changed files with 7 additions and 10 deletions

View File

@ -198,7 +198,6 @@ if ($server > 0 || count($cfg['Servers']) > 1
'select_collation_connection',
$collation_connection,
true,
4,
true
)
. ' </form>' . "\n"

View File

@ -36,8 +36,7 @@ if ($is_create_db_priv) {
'db_collation',
null,
null,
true,
5
true
);
if (! empty($dbstats)) {

View File

@ -24,8 +24,8 @@ if (! defined('PHPMYADMIN')) {
* @return string
*/
function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
$name = null, $id = null, $default = null, $label = true, $indent = 0,
$submitOnChange = false, $displayUnavailable = false
$name = null, $id = null, $default = null, $label = true,
$submitOnChange = false
) {
global $mysql_charsets, $mysql_charsets_descriptions,
$mysql_charsets_available, $mysql_collations, $mysql_collations_available;

View File

@ -245,8 +245,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
'db_collation',
'select_db_collation',
isset($_REQUEST['db_collation']) ? $_REQUEST['db_collation'] : '',
false,
3
false
)
. '</fieldset>'
. '<fieldset class="tblFooters">'
@ -797,7 +796,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
. '<td>'
. PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION,
'tbl_collation', null, $tbl_collation, false, 3
'tbl_collation', null, $tbl_collation, false
)
. '</td>'
. '</tr>';

View File

@ -100,7 +100,7 @@ function PMA_getHtmlForTableConfigurations()
? $_REQUEST['tbl_collation']
: null
),
false, 3
false
)
. '</td>'
. '</tr>';

View File

@ -284,7 +284,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
$this->assertContains('title="German', $result);
$result = PMA_generateCharsetDropdownBox(
2, null, "test_id", "latin1", false, 0, true, false
2, null, "test_id", "latin1", false, true
);
$this->assertContains('name="character_set"', $result);
$this->assertNotContains('Charset</option>', $result);